kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing

[openwrt.git] / target / linux / generic / patches-3.3 / 865-gpiopwm.patch

diff --git a/target/linux/generic/patches-3.3/865-gpiopwm.patch b/target/linux/generic/patches-3.3/865-gpiopwm.patch
index 219de16..015f14a 100644 (file)
--- a/target/linux/generic/patches-3.3/865-gpiopwm.patch
+++ b/target/linux/generic/patches-3.3/865-gpiopwm.patch
@@ -1,8 +1,6 @@
-Index: linux-3.3.8/drivers/Kconfig
-===================================================================
---- linux-3.3.8.orig/drivers/Kconfig   2012-06-01 09:16:13.000000000 +0200
-+++ linux-3.3.8/drivers/Kconfig        2012-07-28 22:16:32.894397322 +0200
-@@ -60,6 +60,8 @@
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
+@@ -60,6 +60,8 @@ source "drivers/pinctrl/Kconfig"
  
  source "drivers/gpio/Kconfig"
  
@@ -11,10 +9,8 @@ Index: linux-3.3.8/drivers/Kconfig
  source "drivers/w1/Kconfig"
  
  source "drivers/power/Kconfig"
-Index: linux-3.3.8/drivers/Makefile
-===================================================================
---- linux-3.3.8.orig/drivers/Makefile  2012-06-01 09:16:13.000000000 +0200
-+++ linux-3.3.8/drivers/Makefile       2012-07-28 22:16:17.990396684 +0200
+--- 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/