diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-25 17:13:24 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-25 17:13:24 +0000 |
| commit | 028cf4dc7c904339041975810b9462768bc397db (patch) | |
| tree | 9be5240a1fb1ccc7bb8c846a4bfbb0b44aeeb152 /target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch | |
| parent | 57f4da235a6c80e23af5edda0db0bf1670c35121 (diff) | |
| download | master-187ad058-028cf4dc7c904339041975810b9462768bc397db.tar.gz master-187ad058-028cf4dc7c904339041975810b9462768bc397db.tar.bz2 master-187ad058-028cf4dc7c904339041975810b9462768bc397db.zip | |
kernel/3.10: refresh all target patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38182 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch b/target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch index b37496ad1a..5bfc54af21 100644 --- a/target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch +++ b/target/linux/lantiq/patches-3.10/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch @@ -17,8 +17,6 @@ Cc: Gabor Juhos <juhosg@openwrt.org> include/linux/reset.h | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) -diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h -index 2f61311..068f073 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -45,7 +45,23 @@ struct reset_controller_dev { @@ -45,8 +43,6 @@ index 2f61311..068f073 100644 +#endif + #endif -diff --git a/include/linux/reset.h b/include/linux/reset.h -index 6082247..1b36c9e 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -1,9 +1,13 @@ @@ -63,7 +59,7 @@ index 6082247..1b36c9e 100644 int reset_control_reset(struct reset_control *rstc); int reset_control_assert(struct reset_control *rstc); int reset_control_deassert(struct reset_control *rstc); -@@ -14,4 +18,43 @@ struct reset_control *devm_reset_control_get(struct device *dev, const char *id) +@@ -14,4 +18,43 @@ struct reset_control *devm_reset_control int device_reset(struct device *dev); @@ -107,6 +103,3 @@ index 6082247..1b36c9e 100644 +#endif + #endif --- -1.7.10.4 - |