ar7-atm: drop LINUX_VERSION tests

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

diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
index 9f1f0fdae47d85931dde46aeb4e82df8345d3070..a970574fe5b3cc7c80e67e1b8ce3b966a96fbeb6 100644 (file)
--- a/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
+++ b/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
@@ -1,30 +1,19 @@
 --- a/tn7dsl.c
 +++ b/tn7dsl.c
-@@ -109,6 +109,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>
-@@ -446,7 +447,9 @@ static void avsar_release(struct device
+@@ -446,7 +446,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,
  };
  
-@@ -455,6 +458,9 @@ int shim_osLoadFWImage(unsigned char *pt
+@@ -455,6 +454,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