diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 10:04:51 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 10:04:51 +0000 |
| commit | 32c88d568cd4e7fc2ec035dff1ae51d3740cabf7 (patch) | |
| tree | 3621cba2b7cff87e666fde5554eb3c86c5de9014 /target/linux/bcm53xx | |
| parent | 36a9f3bb692f379298f620b6b9677a82e77e0827 (diff) | |
| download | upstream-32c88d568cd4e7fc2ec035dff1ae51d3740cabf7.tar.gz upstream-32c88d568cd4e7fc2ec035dff1ae51d3740cabf7.tar.bz2 upstream-32c88d568cd4e7fc2ec035dff1ae51d3740cabf7.zip | |
kernel: backport bcma patches queued for 3.20
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44385 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.14/800-bcma-use-two-different-initcalls-if-built-in.patch | 4 | ||||
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/800-bcma-use-two-different-initcalls-if-built-in.patch | 4 |
2 files changed, 4 insertions, 4 deletions
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; } |