diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-22 17:19:36 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-22 17:19:36 +0000 |
| commit | 22d8dcbf447f54b1a4ff0365c8a5f53736984cf0 (patch) | |
| tree | 44bc4628235a7deaf2f4a1aefa4d1bb5b828e36d /target/linux/adm5120/patches-2.6.36 | |
| parent | 72ca63488b7a1efd184235509176de9526106cde (diff) | |
| download | upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.gz upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.bz2 upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.zip | |
adm5120: make patches apply again and refresh them
SVN-Revision: 24800
Diffstat (limited to 'target/linux/adm5120/patches-2.6.36')
4 files changed, 12 insertions, 12 deletions
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 4f183c49e7..b96307742a 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 d8443ed5fd..fb5fb83127 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 a52dfac7a8..f8e550d9f8 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 00148fa602..626cd85f20 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), } |