summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.6/880-gateworks_system_controller.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commit7e856e5a97966fe89f6336783c0c676eb999e7cf (patch)
treeb5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/880-gateworks_system_controller.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadmtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/880-gateworks_system_controller.patch')
-rw-r--r--target/linux/generic/patches-3.6/880-gateworks_system_controller.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/880-gateworks_system_controller.patch b/target/linux/generic/patches-3.6/880-gateworks_system_controller.patch
index 981610d..02c9d8f 100644
--- a/target/linux/generic/patches-3.6/880-gateworks_system_controller.patch
+++ b/target/linux/generic/patches-3.6/880-gateworks_system_controller.patch
@@ -1,6 +1,6 @@
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
-@@ -423,6 +423,15 @@ config SENSORS_GL520SM
+@@ -434,6 +434,15 @@ config SENSORS_GL520SM
This driver can also be built as a module. If so, the module
will be called gl520sm.
@@ -15,10 +15,10 @@
+
config SENSORS_GPIO_FAN
tristate "GPIO fan"
- depends on GENERIC_GPIO
+ depends on GPIOLIB
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
-@@ -125,6 +125,7 @@ obj-$(CONFIG_SENSORS_W83L785TS) += w83l7
+@@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L785TS) += w83l7
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o