From 70befa402080c2228c8e575744a38b860d6977fc Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 22 Dec 2010 17:18:11 +0000 Subject: kernel: use tab in front of ledtrig-netdev.o and refresh kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24798 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-2.6.30/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.31/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.32/403-ledtrig-usbdev.patch | 6 +++--- target/linux/generic/patches-2.6.34/150-netfilter_imq.patch | 6 +++--- .../generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch | 2 +- target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.34/403-ledtrig-usbdev.patch | 2 +- target/linux/generic/patches-2.6.34/975-ssb_update.patch | 2 +- .../generic/patches-2.6.35/301-ipv6_send_rs_when_forwarding.patch | 2 +- target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.35/403-ledtrig-usbdev.patch | 2 +- target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.36/403-ledtrig-usbdev.patch | 2 +- target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch | 2 +- target/linux/generic/patches-2.6.37/403-ledtrig-usbdev.patch | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) (limited to 'target') diff --git a/target/linux/generic/patches-2.6.30/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.30/402-ledtrig_netdev.patch index c41fecfead..90664d135f 100644 --- a/target/linux/generic/patches-2.6.30/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.30/402-ledtrig_netdev.patch @@ -18,4 +18,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o diff --git a/target/linux/generic/patches-2.6.31/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.31/402-ledtrig_netdev.patch index 9f307004d2..9572fe10d6 100644 --- a/target/linux/generic/patches-2.6.31/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.31/402-ledtrig_netdev.patch @@ -18,4 +18,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o diff --git a/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch index 11a9c9b1ea..11b87acac5 100644 --- a/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch @@ -18,4 +18,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o diff --git a/target/linux/generic/patches-2.6.32/403-ledtrig-usbdev.patch b/target/linux/generic/patches-2.6.32/403-ledtrig-usbdev.patch index 8d208b1387..be3c3c7689 100644 --- a/target/linux/generic/patches-2.6.32/403-ledtrig-usbdev.patch +++ b/target/linux/generic/patches-2.6.32/403-ledtrig-usbdev.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -326,4 +326,11 @@ config LEDS_TRIGGER_NETDEV +@@ -315,4 +315,11 @@ config LEDS_TRIGGER_NETDEV This allows LEDs to be controlled by network device activity. If unsure, say Y. @@ -14,8 +14,8 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -44,3 +44,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt +@@ -42,3 +42,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o 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 diff --git a/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch index 6d324d4aab..8441e41cf8 100644 --- a/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch +++ b/target/linux/generic/patches-2.6.34/150-netfilter_imq.patch @@ -945,7 +945,7 @@ #include #include #include -@@ -1859,7 +1862,11 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -1860,7 +1863,11 @@ int dev_hard_start_xmit(struct sk_buff * int rc = NETDEV_TX_OK; if (likely(!skb->next)) { @@ -958,7 +958,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1969,8 +1976,7 @@ static inline u16 dev_cap_txqueue(struct +@@ -1970,8 +1977,7 @@ static inline u16 dev_cap_txqueue(struct return queue_index; } @@ -968,7 +968,7 @@ { int queue_index; struct sock *sk = skb->sk; -@@ -1999,6 +2005,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -2000,6 +2006,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } diff --git a/target/linux/generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch b/target/linux/generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch index d851d313ee..1dc655007e 100644 --- a/target/linux/generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch +++ b/target/linux/generic/patches-2.6.34/223-kobject-add-broadcast_uevent.patch @@ -20,7 +20,7 @@ #else static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action) -@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct +@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct static inline int kobject_action_type(const char *buf, size_t count, enum kobject_action *type) { return -EINVAL; } diff --git a/target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch index 858966c908..001524681e 100644 --- a/target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.34/402-ledtrig_netdev.patch @@ -18,4 +18,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o diff --git a/target/linux/generic/patches-2.6.34/403-ledtrig-usbdev.patch b/target/linux/generic/patches-2.6.34/403-ledtrig-usbdev.patch index 2fe8121e4b..96515f8b09 100644 --- a/target/linux/generic/patches-2.6.34/403-ledtrig-usbdev.patch +++ b/target/linux/generic/patches-2.6.34/403-ledtrig-usbdev.patch @@ -17,5 +17,5 @@ @@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o 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 diff --git a/target/linux/generic/patches-2.6.34/975-ssb_update.patch b/target/linux/generic/patches-2.6.34/975-ssb_update.patch index e9b06d06bf..2a5b0cd954 100644 --- a/target/linux/generic/patches-2.6.34/975-ssb_update.patch +++ b/target/linux/generic/patches-2.6.34/975-ssb_update.patch @@ -385,7 +385,7 @@ u32 pmucap; if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU)) -@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon +@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev, pmucap); diff --git a/target/linux/generic/patches-2.6.35/301-ipv6_send_rs_when_forwarding.patch b/target/linux/generic/patches-2.6.35/301-ipv6_send_rs_when_forwarding.patch index e03929918e..eb79a784cc 100644 --- a/target/linux/generic/patches-2.6.35/301-ipv6_send_rs_when_forwarding.patch +++ b/target/linux/generic/patches-2.6.35/301-ipv6_send_rs_when_forwarding.patch @@ -1,6 +1,6 @@ --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -2961,7 +2961,8 @@ static void addrconf_dad_completed(struc +@@ -2963,7 +2963,8 @@ static void addrconf_dad_completed(struc start sending router solicitations. */ diff --git a/target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch index 4ee69aa857..0c52f63365 100644 --- a/target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch @@ -18,4 +18,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o diff --git a/target/linux/generic/patches-2.6.35/403-ledtrig-usbdev.patch b/target/linux/generic/patches-2.6.35/403-ledtrig-usbdev.patch index a84ce847dd..1b44e662d8 100644 --- a/target/linux/generic/patches-2.6.35/403-ledtrig-usbdev.patch +++ b/target/linux/generic/patches-2.6.35/403-ledtrig-usbdev.patch @@ -17,5 +17,5 @@ @@ -50,3 +50,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o 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 diff --git a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch index 068d126e73..4eb139b9ba 100644 --- a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch @@ -18,7 +18,7 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o --- a/drivers/leds/ledtrig-netdev.c +++ b/drivers/leds/ledtrig-netdev.c @@ -307,8 +307,9 @@ done: diff --git a/target/linux/generic/patches-2.6.36/403-ledtrig-usbdev.patch b/target/linux/generic/patches-2.6.36/403-ledtrig-usbdev.patch index fe334d5ed1..970af3b633 100644 --- a/target/linux/generic/patches-2.6.36/403-ledtrig-usbdev.patch +++ b/target/linux/generic/patches-2.6.36/403-ledtrig-usbdev.patch @@ -17,5 +17,5 @@ @@ -51,3 +51,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o 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 diff --git a/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch index 45a42ef8fb..6406adac2a 100644 --- a/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.37/402-ledtrig_netdev.patch @@ -18,7 +18,7 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o --- a/drivers/leds/ledtrig-netdev.c +++ b/drivers/leds/ledtrig-netdev.c @@ -307,8 +307,9 @@ done: diff --git a/target/linux/generic/patches-2.6.37/403-ledtrig-usbdev.patch b/target/linux/generic/patches-2.6.37/403-ledtrig-usbdev.patch index fb9bcfa697..25c6745f68 100644 --- a/target/linux/generic/patches-2.6.37/403-ledtrig-usbdev.patch +++ b/target/linux/generic/patches-2.6.37/403-ledtrig-usbdev.patch @@ -17,5 +17,5 @@ @@ -54,3 +54,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o 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 -- cgit v1.2.3