[orion]: upgrade to 2.6.36

[openwrt.git] / target / linux / generic / patches-2.6.34 / 890-generic_pwm_api.patch

diff --git a/target/linux/generic/patches-2.6.34/890-generic_pwm_api.patch b/target/linux/generic/patches-2.6.34/890-generic_pwm_api.patch
index 6c58e53..0922d48 100644 (file)
--- a/target/linux/generic/patches-2.6.34/890-generic_pwm_api.patch
+++ b/target/linux/generic/patches-2.6.34/890-generic_pwm_api.patch
@@ -5,8 +5,6 @@ Based on:
 Ignore the LEDS part atm
 ---
 
-diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index 049ff24..b94666c 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
 @@ -5,7 +5,6 @@
@@ -17,8 +15,6 @@ index 049ff24..b94666c 100644
  obj-$(CONFIG_ATMEL_SSC)               += atmel-ssc.o
  obj-$(CONFIG_ATMEL_TCLIB)     += atmel_tclib.o
  obj-$(CONFIG_ICS932S401)      += ics932s401.o
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index 368ae6d..54d7b16 100644
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig
 @@ -54,6 +54,8 @@ source "drivers/pps/Kconfig"
@@ -30,8 +26,6 @@ index 368ae6d..54d7b16 100644
  source "drivers/w1/Kconfig"
  
  source "drivers/power/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 6ee53c7..e6143f3 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
 @@ -6,6 +6,8 @@
@@ -43,4 +37,3 @@ index 6ee53c7..e6143f3 100644
  obj-$(CONFIG_PCI)             += pci/
  obj-$(CONFIG_PARISC)          += parisc/
  obj-$(CONFIG_RAPIDIO)         += rapidio/
-diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig