diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-10-13 11:32:31 +0200 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2017-10-29 23:41:00 +0100 |
| commit | 889b21f95414dcff942cb5f72d764d876b68ace2 (patch) | |
| tree | 3d89902692a5f3e7ec227a36ac96a01ce5e54fd9 /package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch | |
| parent | b00cf0e58e701821a1117afbad76718d898ea21d (diff) | |
| download | upstream-889b21f95414dcff942cb5f72d764d876b68ace2.tar.gz upstream-889b21f95414dcff942cb5f72d764d876b68ace2.tar.bz2 upstream-889b21f95414dcff942cb5f72d764d876b68ace2.zip | |
ar7-atm: drop LINUX_VERSION tests
Minimum supported kernel is 3.18, so we don't need to test for anything
older. In addition, the API hasn't changed since then, so we don't need
to check for any kernel version at all. This helps to keeps the amount
of changes more managable.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch')
| -rw-r--r-- | package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch | 19 |
1 files changed, 4 insertions, 15 deletions
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 6692f40f6a..53767e45be 100644 --- 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 |