compat-drivers: make patches apply again
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 3 Feb 2013 12:31:27 +0000 (13:31 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 3 Feb 2013 14:06:37 +0000 (15:06 +0100)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/collateral-evolutions/network/45-remove-platform-id-table.patch

index 29c4e736da51b395ec2fcaabb095afb9ba5033b8..c14a8b1d4dbfee9f7311c23663a3a663ee0f915c 100644 (file)
@@ -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