diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
commit | eb0c0200624c487af549aca9eddb722413dbc1cd (patch) | |
tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/880-gateworks_system_controller.patch | |
parent | 8b3c85ca8244eec0d01eea269922d780f73ccebb (diff) |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 6 |
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 981610dad1..02c9d8f9aa 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 |