aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/865-gpiopwm.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/865-gpiopwm.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadupstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/865-gpiopwm.patch')
-rw-r--r--target/linux/generic/patches-3.6/865-gpiopwm.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.6/865-gpiopwm.patch b/target/linux/generic/patches-3.6/865-gpiopwm.patch
index 015f14ab31..0ed0c966dd 100644
--- a/target/linux/generic/patches-3.6/865-gpiopwm.patch
+++ b/target/linux/generic/patches-3.6/865-gpiopwm.patch
@@ -11,11 +11,11 @@
source "drivers/power/Kconfig"
--- a/drivers/Makefile
+++ b/drivers/Makefile
-@@ -8,6 +8,7 @@
- # GPIO must come after pinctrl as gpios may need to mux pins etc
- obj-y += pinctrl/
+@@ -10,6 +10,7 @@ obj-y += pinctrl/
obj-y += gpio/
-+obj-$(CONFIG_GENERIC_PWM) += pwm/
+ obj-y += pwm/
obj-$(CONFIG_PCI) += pci/
++obj-$(CONFIG_GENERIC_PWM) += pwm/
obj-$(CONFIG_PARISC) += parisc/
obj-$(CONFIG_RAPIDIO) += rapidio/
+ obj-y += video/