diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-22 17:18:11 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-22 17:18:11 +0000 |
| commit | 70befa402080c2228c8e575744a38b860d6977fc (patch) | |
| tree | 6aae171717a6640c2046914fa8900d32141d9df1 /target/linux/generic/patches-2.6.34 | |
| parent | 81ec835fad3c705b739380fcbb1f5f29b3166254 (diff) | |
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
Diffstat (limited to 'target/linux/generic/patches-2.6.34')
5 files changed, 7 insertions, 7 deletions
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 6d324d4aa..8441e41cf 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 <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -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 d851d313e..1dc655007 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 858966c90..001524681 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 2fe8121e4..96515f8b0 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 e9b06d06b..2a5b0cd95 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); |