From ddcbef5766fa18f52e7a7d1928b25edc63e73937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 11 Feb 2015 10:04:51 +0000 Subject: kernel: backport bcma patches queued for 3.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 44385 --- .../800-bcma-use-two-different-initcalls-if-built-in.patch | 4 ++-- .../800-bcma-use-two-different-initcalls-if-built-in.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/bcm53xx') diff --git a/target/linux/bcm53xx/patches-3.14/800-bcma-use-two-different-initcalls-if-built-in.patch b/target/linux/bcm53xx/patches-3.14/800-bcma-use-two-different-initcalls-if-built-in.patch index 9d229a4c33..6ae555b4dc 100644 --- a/target/linux/bcm53xx/patches-3.14/800-bcma-use-two-different-initcalls-if-built-in.patch +++ b/target/linux/bcm53xx/patches-3.14/800-bcma-use-two-different-initcalls-if-built-in.patch @@ -29,7 +29,7 @@ diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 9635f10..c394207 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -639,13 +639,25 @@ static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env) +@@ -637,13 +637,25 @@ static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env) core->id.rev, core->id.class); } @@ -56,7 +56,7 @@ index 9635f10..c394207 100644 err = bcma_host_soc_register_driver(); if (err) { -@@ -662,7 +674,7 @@ static int __init bcma_modinit(void) +@@ -660,7 +672,7 @@ static int __init bcma_modinit(void) return err; } diff --git a/target/linux/bcm53xx/patches-3.18/800-bcma-use-two-different-initcalls-if-built-in.patch b/target/linux/bcm53xx/patches-3.18/800-bcma-use-two-different-initcalls-if-built-in.patch index 9d229a4c33..6ae555b4dc 100644 --- a/target/linux/bcm53xx/patches-3.18/800-bcma-use-two-different-initcalls-if-built-in.patch +++ b/target/linux/bcm53xx/patches-3.18/800-bcma-use-two-different-initcalls-if-built-in.patch @@ -29,7 +29,7 @@ diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 9635f10..c394207 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -639,13 +639,25 @@ static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env) +@@ -637,13 +637,25 @@ static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env) core->id.rev, core->id.class); } @@ -56,7 +56,7 @@ index 9635f10..c394207 100644 err = bcma_host_soc_register_driver(); if (err) { -@@ -662,7 +674,7 @@ static int __init bcma_modinit(void) +@@ -660,7 +672,7 @@ static int __init bcma_modinit(void) return err; } -- cgit v1.2.3