aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/031-bcma-from-4.5.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-08 09:54:51 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-08 09:54:51 +0200
commite3ab280e47000aee3dc0ea916bcb656490e9839d (patch)
tree4e61f399b6624044b76e9437660eea975345080f /target/linux/generic/pending-3.18/031-bcma-from-4.5.patch
parent5742a2ba35e20b7fe7ca9aac3ceb42e0a4f37ca0 (diff)
downloadupstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.tar.gz
upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.tar.bz2
upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.zip
kernel: remove linux 3.18 support
No targets are using it anymore Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/031-bcma-from-4.5.patch')
-rw-r--r--target/linux/generic/pending-3.18/031-bcma-from-4.5.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/target/linux/generic/pending-3.18/031-bcma-from-4.5.patch b/target/linux/generic/pending-3.18/031-bcma-from-4.5.patch
deleted file mode 100644
index 171395dcec..0000000000
--- a/target/linux/generic/pending-3.18/031-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)
- {