compat-wireless: remove platform_device_id for kernel < 2.6.30
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 22 Dec 2011 20:47:26 +0000 (21:47 +0100)
committerLuis R. Rodriguez <mcgrof@frijolero.org>
Fri, 23 Dec 2011 15:06:49 +0000 (07:06 -0800)
Kernel < 2.6.30 do not support struct platform_device_id, so remove it
for them and hope that the probing will reject an invalid device.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
patches/45-remove-platform-id-table.patch [new file with mode: 0644]

diff --git a/patches/45-remove-platform-id-table.patch b/patches/45-remove-platform-id-table.patch
new file mode 100644 (file)
index 0000000..aa96ecb
--- /dev/null
@@ -0,0 +1,23 @@
+--- a/drivers/net/wireless/wl12xx/main.c
++++ b/drivers/net/wireless/wl12xx/main.c
+@@ -5321,16 +5321,20 @@ static int __devexit wl12xx_remove(struc
+       return 0;
+ }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+ static const struct platform_device_id wl12xx_id_table[] __devinitconst = {
+       { "wl12xx", 0 },
+       {  } /* Terminating Entry */
+ };
+ MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
++#endif
+ static struct platform_driver wl12xx_driver = {
+       .probe          = wl12xx_probe,
+       .remove         = __devexit_p(wl12xx_remove),
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+       .id_table       = wl12xx_id_table,
++#endif
+       .driver = {
+               .name   = "wl12xx_driver",
+               .owner  = THIS_MODULE,