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 | ddcbef5766fa18f52e7a7d1928b25edc63e73937 (patch) | |
| tree | 46673fa883efd5498574b66206349b3de8e4ef5b /target/linux/bcm53xx | |
| parent | d417d58ff7d9f129dc0b258ccf70c62d4a6214bf (diff) | |
| download | master-31e0f0ae-ddcbef5766fa18f52e7a7d1928b25edc63e73937.tar.gz master-31e0f0ae-ddcbef5766fa18f52e7a7d1928b25edc63e73937.tar.bz2 master-31e0f0ae-ddcbef5766fa18f52e7a7d1928b25edc63e73937.zip | |
kernel: backport bcma patches queued for 3.20
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44385
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; } |