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.32 | |
| 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.32')
| -rw-r--r-- | target/linux/adm5120/patches-2.6.32/007-adm5120_pci.patch | 2 | ||||
| -rw-r--r-- | target/linux/adm5120/patches-2.6.32/009-adm5120_leds_switch_trigger.patch | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/adm5120/patches-2.6.32/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.32/007-adm5120_pci.patch index 91bd79d761..b06d7947ce 100644 --- a/target/linux/adm5120/patches-2.6.32/007-adm5120_pci.patch +++ b/target/linux/adm5120/patches-2.6.32/007-adm5120_pci.patch @@ -10,7 +10,7 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -1748,6 +1748,9 @@ +@@ -1752,6 +1752,9 @@ #define PCI_VENDOR_ID_ESDGMBH 0x12fe #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 diff --git a/target/linux/adm5120/patches-2.6.32/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches-2.6.32/009-adm5120_leds_switch_trigger.patch index 272fb8f19c..2f6eaf06e3 100644 --- a/target/linux/adm5120/patches-2.6.32/009-adm5120_leds_switch_trigger.patch +++ b/target/linux/adm5120/patches-2.6.32/009-adm5120_leds_switch_trigger.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -315,4 +315,12 @@ config LEDS_TRIGGER_NETDEV - This allows LEDs to be controlled by network device activity. - If unsure, say Y. +@@ -322,4 +322,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 -@@ -42,3 +42,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt - obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o +@@ -43,3 +43,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 |