From fb3616ed90169e3ce4f2ff5b12ee5a2e2ea5b7b6 Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 22 Dec 2010 17:19:36 +0000
Subject: adm5120: make patches apply again and refresh them

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24800 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/adm5120/patches-2.6.36/001-adm5120.patch        |  4 ++--
 target/linux/adm5120/patches-2.6.36/003-adm5120_switch.patch |  4 ++--
 .../patches-2.6.36/009-adm5120_leds_switch_trigger.patch     | 12 ++++++------
 .../adm5120/patches-2.6.36/102-jedec_pmc_39lvxxx_chips.patch |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'target/linux/adm5120/patches-2.6.36')

diff --git a/target/linux/adm5120/patches-2.6.36/001-adm5120.patch b/target/linux/adm5120/patches-2.6.36/001-adm5120.patch
index 4f183c49e..b96307742 100644
--- a/target/linux/adm5120/patches-2.6.36/001-adm5120.patch
+++ b/target/linux/adm5120/patches-2.6.36/001-adm5120.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -25,6 +25,21 @@ choice
+@@ -26,6 +26,21 @@ choice
  	prompt "System type"
  	default SGI_IP22
  
@@ -22,7 +22,7 @@
  config MIPS_ALCHEMY
  	bool "Alchemy processor based machines"
  	select 64BIT_PHYS_ADDR
-@@ -707,6 +722,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+@@ -708,6 +723,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
  
  endchoice
  
diff --git a/target/linux/adm5120/patches-2.6.36/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.36/003-adm5120_switch.patch
index d8443ed5f..fb5fb8312 100644
--- a/target/linux/adm5120/patches-2.6.36/003-adm5120_switch.patch
+++ b/target/linux/adm5120/patches-2.6.36/003-adm5120_switch.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -491,6 +491,10 @@ config MIPS_AU1X00_ENET
+@@ -614,6 +614,10 @@ config MIPS_AU1X00_ENET
  	  If you have an Alchemy Semi AU1X00 based system
  	  say Y.  Otherwise, say N.
  
@@ -13,7 +13,7 @@
  	depends on PCI && SGI_IP27
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
-@@ -212,6 +212,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
+@@ -213,6 +213,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
  # This is also a 82596 and should probably be merged
  obj-$(CONFIG_LP486E) += lp486e.o
  
diff --git a/target/linux/adm5120/patches-2.6.36/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches-2.6.36/009-adm5120_leds_switch_trigger.patch
index a52dfac7a..f8e550d9f 100644
--- a/target/linux/adm5120/patches-2.6.36/009-adm5120_leds_switch_trigger.patch
+++ b/target/linux/adm5120/patches-2.6.36/009-adm5120_leds_switch_trigger.patch
@@ -1,8 +1,8 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -391,4 +391,12 @@ config LEDS_TRIGGER_NETDEV
- 	  This allows LEDs to be controlled by network device activity.
- 	  If unsure, say Y.
+@@ -398,4 +398,12 @@ config LEDS_TRIGGER_USBDEV
+ 	  This allows LEDs to be controlled by the presence/activity of
+ 	  an USB device. If unsure, say N.
  
 +config LEDS_TRIGGER_ADM5120_SWITCH
 +	tristate "LED ADM5120 Switch Port Status Trigger"
@@ -15,8 +15,8 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -51,3 +51,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledt
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
+@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+=
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
- obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+ obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
diff --git a/target/linux/adm5120/patches-2.6.36/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches-2.6.36/102-jedec_pmc_39lvxxx_chips.patch
index 00148fa60..626cd85f2 100644
--- a/target/linux/adm5120/patches-2.6.36/102-jedec_pmc_39lvxxx_chips.patch
+++ b/target/linux/adm5120/patches-2.6.36/102-jedec_pmc_39lvxxx_chips.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/jedec_probe.c
 +++ b/drivers/mtd/chips/jedec_probe.c
-@@ -115,6 +115,10 @@
+@@ -116,6 +116,10 @@
  #define UPD29F064115	0x221C
  
  /* PMC */
@@ -11,7 +11,7 @@
  #define PM49FL002	0x006D
  #define PM49FL004	0x006E
  #define PM49FL008	0x006A
-@@ -1259,6 +1263,54 @@ static const struct amd_flash_info jedec
+@@ -1273,6 +1277,54 @@ static const struct amd_flash_info jedec
  			ERASEINFO(0x02000,2),
  			ERASEINFO(0x04000,1),
  		}
-- 
cgit v1.2.3