kernel: update 3.18 to 3.18.14
[openwrt/svn-archive/archive.git] / target / linux / oxnas / patches-3.18 / 350-oxnas-reset.patch
1 --- a/drivers/reset/Kconfig
2 +++ b/drivers/reset/Kconfig
3 @@ -12,4 +12,9 @@ menuconfig RESET_CONTROLLER
4
5 If unsure, say no.
6
7 +config RESET_CONTROLLER_OXNAS
8 + bool
9 + select RESET_CONTROLLER
10 +
11 source "drivers/reset/sti/Kconfig"
12 +
13 --- a/drivers/reset/Makefile
14 +++ b/drivers/reset/Makefile
15 @@ -1,4 +1,5 @@
16 obj-$(CONFIG_RESET_CONTROLLER) += core.o
17 +obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o
18 obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o
19 obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
20 obj-$(CONFIG_ARCH_STI) += sti/