summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/45-remove-platform-id-table.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-02-03 13:31:27 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2013-02-03 15:06:37 +0100
commit51762097d1f9e14ee7c74134cf5b80b5600fd837 (patch)
tree7c7fb693ce4679584c12e23639d7912c0bb9a35d /patches/collateral-evolutions/network/45-remove-platform-id-table.patch
parent3e5178598c2ce38853638c42e0b3103ce39fa96e (diff)
compat-drivers: make patches apply again
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/45-remove-platform-id-table.patch')
-rw-r--r--patches/collateral-evolutions/network/45-remove-platform-id-table.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/45-remove-platform-id-table.patch b/patches/collateral-evolutions/network/45-remove-platform-id-table.patch
index 29c4e736..c14a8b1d 100644
--- a/patches/collateral-evolutions/network/45-remove-platform-id-table.patch
+++ b/patches/collateral-evolutions/network/45-remove-platform-id-table.patch
@@ -1,7 +1,7 @@
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
-@@ -1725,16 +1725,20 @@ out:
- return ret;
+@@ -1813,16 +1813,20 @@ out:
+ return wlcore_remove(pdev);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
@@ -14,7 +14,7 @@
static struct platform_driver wl12xx_driver = {
.probe = wl12xx_probe,
- .remove = wlcore_remove,
+ .remove = wl12xx_remove,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
.id_table = wl12xx_id_table,
+#endif