diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
| commit | c92885c466d11dc3b8e2837a8be1fd3b6b7e2e01 (patch) | |
| tree | 1a38200fe1a33cb965650ca687167175938fbedd /target/linux/rdc-2.6/patches/002-r6040_ethernet.patch | |
| parent | a8131d463830012d225fa1032222c3a38b168778 (diff) | |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rdc-2.6/patches/002-r6040_ethernet.patch')
| -rw-r--r-- | target/linux/rdc-2.6/patches/002-r6040_ethernet.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch b/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch index 88a9ea17ea..1402369bfb 100644 --- a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch +++ b/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch @@ -187,7 +187,7 @@ diff -urN linux-2.6.17/drivers/net/r6040.c linux-2.6.17.new/drivers/net/r6040.c + +static int rdc_open(struct net_device *dev); +static int rdc_start_xmit(struct sk_buff *skb, struct net_device *dev); -+static irqreturn_t rdc_interrupt(int irq, void *dev_id, struct pt_regs *regs); ++static irqreturn_t rdc_interrupt(int irq, void *dev_id); +static struct net_device_stats *rdc_get_stats(struct net_device *dev); +static int rdc_close(struct net_device *dev); +static void set_multicast_list(struct net_device *dev); @@ -439,7 +439,7 @@ diff -urN linux-2.6.17/drivers/net/r6040.c linux-2.6.17.new/drivers/net/r6040.c + +/* The RDC interrupt handler. */ +static irqreturn_t -+rdc_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++rdc_interrupt(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct rdc_private *lp; |