package/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch

   1 --- a/tn7dsl.c
   2 +++ b/tn7dsl.c
   3 @@ -109,6 +109,7 @@
   4  #include <linux/vmalloc.h>
   5  #include <linux/file.h>
   6  #include <linux/firmware.h>
   7 +#include <linux/version.h>
   8
   9  #include <asm/io.h>
  10  #include <asm/ar7/ar7.h>
  11 @@ -446,7 +447,9 @@ static void avsar_release(struct device
  12  }
  13
  14  static struct device avsar = {
  15 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
  16         .bus_id    = "vlynq",
  17 +#endif
  18         .release   = avsar_release,
  19  };
  20
  21 @@ -455,6 +458,9 @@ int shim_osLoadFWImage(unsigned char *pt
  22         const struct firmware *fw_entry;
  23         size_t size;
  24
  25 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
  26 +       dev_set_name(&avsar, "avsar");
  27 +#endif
  28         printk("requesting firmware image \"ar0700xx.bin\"\n");
  29         if(device_register(&avsar) < 0) {
  30                 printk(KERN_ERR