aboutsummaryrefslogtreecommitdiffstats
path: root/package/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
blob: 9f1f0fdae47d85931dde46aeb4e82df8345d3070 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- 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
 }
 
 static struct device avsar = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
 	.bus_id    = "vlynq",
+#endif
 	.release   = avsar_release,
 };
 
@@ -455,6 +458,9 @@ 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