ar7-atm: drop LINUX_VERSION tests

[openwrt/openwrt.git] / package / kernel / ar7-atm / patches-D7.05.01.00 / 170-bus_id_removal.patch

diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch
index 6692f40f6a95eaf4675257a731f4100eab596a6f..53767e45bec173549b6365f1afe60de2ff82d88b 100644 (file)
--- a/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch
+++ b/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch
@@ -1,30 +1,19 @@
 --- a/tn7dsl.c
 +++ b/tn7dsl.c
-@@ -117,6 +117,7 @@
- #include <linux/vmalloc.h>
- #include <linux/file.h>
- #include <linux/firmware.h>
-+#include <linux/version.h>
- 
- #include <asm/io.h>
- #include <asm/ar7/ar7.h>
-@@ -492,7 +493,9 @@ static void avsar_release(struct device
+@@ -492,7 +492,6 @@ static void avsar_release(struct device
  }
  
  static struct device avsar = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-       .bus_id    = "vlynq",
-+#endif
+-      .bus_id    = "vlynq",
        .release   = avsar_release,
  };
  
-@@ -501,6 +504,9 @@ int shim_osLoadFWImage(unsigned char *pt
+@@ -501,6 +500,8 @@ int shim_osLoadFWImage(unsigned char *pt
        const struct firmware *fw_entry;
        size_t size;
  
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
 +      dev_set_name(&avsar, "avsar");
-+#endif
++
        printk("requesting firmware image \"ar0700xx.bin\"\n");
        if(device_register(&avsar) < 0) {
                printk(KERN_ERR