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/865-gpiopwm.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/865-gpiopwm.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/865-gpiopwm.patch | 8 |
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/ |