diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
| commit | 6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch) | |
| tree | b35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/oxnas/patches-3.14/350-oxnas-reset.patch | |
| parent | a899dbd4e32835b0a1d917479d10e5a2744c273c (diff) | |
| download | master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2 master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip | |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.14/350-oxnas-reset.patch')
| -rw-r--r-- | target/linux/oxnas/patches-3.14/350-oxnas-reset.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch index 820d70b2df..8878868d4d 100644 --- a/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch +++ b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/reset/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/reset/Kconfig -+++ linux-3.14.18/drivers/reset/Kconfig +--- a/drivers/reset/Kconfig ++++ b/drivers/reset/Kconfig @@ -11,3 +11,7 @@ menuconfig RESET_CONTROLLER via GPIOs or SoC-internal reset controller modules. @@ -10,10 +8,8 @@ Index: linux-3.14.18/drivers/reset/Kconfig +config RESET_CONTROLLER_OXNAS + bool + select RESET_CONTROLLER -Index: linux-3.14.18/drivers/reset/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/reset/Makefile -+++ linux-3.14.18/drivers/reset/Makefile +--- a/drivers/reset/Makefile ++++ b/drivers/reset/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_RESET_CONTROLLER) += core.o +obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o |