diff options
author | Felix Fietkau <nbd@nbd.name> | 2017-01-10 18:15:39 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-01-11 13:09:33 +0100 |
commit | b7bee2858b582164d55c32be44df3fcb42cafc78 (patch) | |
tree | d908808a56549ec42e1b269421fd1be2dbd57f45 /target/linux/generic/patches-4.1/024-bcma-from-4.5.patch | |
parent | b1dbe6028eed57a89ae94c5e61e0b1e65f3aeb80 (diff) | |
download | upstream-b7bee2858b582164d55c32be44df3fcb42cafc78.tar.gz upstream-b7bee2858b582164d55c32be44df3fcb42cafc78.tar.bz2 upstream-b7bee2858b582164d55c32be44df3fcb42cafc78.zip |
kernel: remove linux 4.1 support
The only target still referencing it is omap24xx, and it is marked as
broken.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/patches-4.1/024-bcma-from-4.5.patch')
-rw-r--r-- | target/linux/generic/patches-4.1/024-bcma-from-4.5.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/target/linux/generic/patches-4.1/024-bcma-from-4.5.patch b/target/linux/generic/patches-4.1/024-bcma-from-4.5.patch deleted file mode 100644 index 171395dcec..0000000000 --- a/target/linux/generic/patches-4.1/024-bcma-from-4.5.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -637,11 +637,36 @@ static int bcma_device_uevent(struct dev - core->id.rev, core->id.class); - } - --static int __init bcma_modinit(void) -+static unsigned int bcma_bus_registered; -+ -+/* -+ * If built-in, bus has to be registered early, before any driver calls -+ * bcma_driver_register. -+ * Otherwise registering driver would trigger BUG in driver_register. -+ */ -+static int __init bcma_init_bus_register(void) - { - int err; - -+ if (bcma_bus_registered) -+ return 0; -+ - err = bus_register(&bcma_bus_type); -+ if (!err) -+ bcma_bus_registered = 1; -+ -+ return err; -+} -+#ifndef MODULE -+fs_initcall(bcma_init_bus_register); -+#endif -+ -+/* Main initialization has to be done with SPI/mtd/NAND/SPROM available */ -+static int __init bcma_modinit(void) -+{ -+ int err; -+ -+ err = bcma_init_bus_register(); - if (err) - return err; - -@@ -660,7 +685,7 @@ static int __init bcma_modinit(void) - - return err; - } --fs_initcall(bcma_modinit); -+module_init(bcma_modinit); - - static void __exit bcma_modexit(void) - { |