refresh patches

SVN-Revision: 15581

23 files changed, 55 insertions, 152 deletions

diff --git a/target/linux/rb532/patches-2.6.28/002-pci_io_map_base.patch b/target/linux/rb532/patches-2.6.28/002-pci_io_map_base.patch
index 5786803e47..49dea20c63 100644
--- a/target/linux/rb532/patches-2.6.28/002-pci_io_map_base.patch
+++ b/target/linux/rb532/patches-2.6.28/002-pci_io_map_base.patch
@@ -7,11 +7,9 @@ Tested-by: Florian Fainelli <florian@openwrt.org>
  arch/mips/pci/pci-rc32434.c |   11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/pci/pci-rc32434.c b/arch/mips/pci/pci-rc32434.c
-index 1c2821e..71f7d27 100644
 --- a/arch/mips/pci/pci-rc32434.c
 +++ b/arch/mips/pci/pci-rc32434.c
-@@ -205,6 +205,8 @@ static int __init rc32434_pcibridge_init(void)
+@@ -205,6 +205,8 @@ static int __init rc32434_pcibridge_init
  
  static int __init rc32434_pci_init(void)
  {
@@ -36,7 +34,3 @@ index 1c2821e..71f7d27 100644
  	register_pci_controller(&rc32434_controller);
  	rc32434_sync();
  
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/003-gpio_bit_setting.patch b/target/linux/rb532/patches-2.6.28/003-gpio_bit_setting.patch
index 49f9f4b3b5..80272aec40 100644
--- a/target/linux/rb532/patches-2.6.28/003-gpio_bit_setting.patch
+++ b/target/linux/rb532/patches-2.6.28/003-gpio_bit_setting.patch
@@ -8,11 +8,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  arch/mips/rb532/gpio.c |    6 ++----
  1 files changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
-index 0e84c8a..e35cb75 100644
 --- a/arch/mips/rb532/gpio.c
 +++ b/arch/mips/rb532/gpio.c
-@@ -119,13 +119,11 @@ static inline void rb532_set_bit(unsigned bitval,
+@@ -119,13 +119,11 @@ static inline void rb532_set_bit(unsigne
  	unsigned long flags;
  	u32 val;
  
@@ -28,8 +26,3 @@ index 0e84c8a..e35cb75 100644
  	writel(val, ioaddr);
  
  	local_irq_restore(flags);
--- 
-1.5.6.4
-
-
-
diff --git a/target/linux/rb532/patches-2.6.28/004-fix_pata_rb532_cf.patch b/target/linux/rb532/patches-2.6.28/004-fix_pata_rb532_cf.patch
index d1d73ac9c6..e1e417a558 100644
--- a/target/linux/rb532/patches-2.6.28/004-fix_pata_rb532_cf.patch
+++ b/target/linux/rb532/patches-2.6.28/004-fix_pata_rb532_cf.patch
@@ -10,9 +10,8 @@ be cleared. This is being done at the end of rb532_pata_irq_handler.
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 Acked-by: Florian Fainelli <florian@openwrt.org>
 ---
-diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c
---- linux-2.6.28.7/drivers/ata/pata_rb532_cf.c	2009-02-20 23:41:27.000000000 +0100
-+++ linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c	2009-03-15 13:21:06.000000000 +0100
+--- a/drivers/ata/pata_rb532_cf.c
++++ b/drivers/ata/pata_rb532_cf.c
 @@ -31,6 +31,7 @@
  #include <scsi/scsi_host.h>
  
@@ -21,7 +20,7 @@ diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/
  
  #define DRV_NAME	"pata-rb532-cf"
  #define DRV_VERSION	"0.1.0"
-@@ -63,8 +64,8 @@
+@@ -63,8 +64,8 @@ static inline void rb532_pata_finish_io(
  	   ata_sff_sync might be sufficient. */
  	ata_sff_dma_pause(ap);
  	ndelay(RB500_CF_IO_DELAY);
@@ -32,7 +31,7 @@ diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/
  }
  
  static void rb532_pata_exec_command(struct ata_port *ap,
-@@ -113,13 +114,15 @@
+@@ -113,13 +114,15 @@ static irqreturn_t rb532_pata_irq_handle
  	struct rb532_cf_info *info = ah->private_data;
  
  	if (gpio_get_value(info->gpio_line)) {
diff --git a/target/linux/rb532/patches-2.6.28/005-pata_rb532_cf_4bytes_rw.patch b/target/linux/rb532/patches-2.6.28/005-pata_rb532_cf_4bytes_rw.patch
index 1af14ad6f0..ff1f8dc8ce 100644
--- a/target/linux/rb532/patches-2.6.28/005-pata_rb532_cf_4bytes_rw.patch
+++ b/target/linux/rb532/patches-2.6.28/005-pata_rb532_cf_4bytes_rw.patch
@@ -10,10 +10,9 @@ original driver always transfers 512 Bytes at once.
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 Acked-by: Sergei Shtyltov <sshtylyov@ru.mvista.com>
 ---
-diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c
---- linux-2.6.28.7/drivers/ata/pata_rb532_cf.c	2009-03-15 13:24:24.000000000 +0100
-+++ linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c	2009-03-15 13:26:19.000000000 +0100
-@@ -82,13 +82,10 @@
+--- a/drivers/ata/pata_rb532_cf.c
++++ b/drivers/ata/pata_rb532_cf.c
+@@ -82,13 +82,10 @@ static unsigned int rb532_pata_data_xfer
  	void __iomem *ioaddr = ap->ioaddr.data_addr;
  	int retlen = buflen;
  
diff --git a/target/linux/rb532/patches-2.6.28/006-pata_rb532_cf_fix_prototype.patch b/target/linux/rb532/patches-2.6.28/006-pata_rb532_cf_fix_prototype.patch
index 7a25bcb68b..72f00eb0db 100644
--- a/target/linux/rb532/patches-2.6.28/006-pata_rb532_cf_fix_prototype.patch
+++ b/target/linux/rb532/patches-2.6.28/006-pata_rb532_cf_fix_prototype.patch
@@ -5,10 +5,9 @@ bytes, so alter the return value accordingly.
 
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 ---
-diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c
---- linux-2.6.28.7/drivers/ata/pata_rb532_cf.c	2009-03-15 13:29:09.000000000 +0100
-+++ linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c	2009-03-15 13:29:46.000000000 +0100
-@@ -88,7 +88,7 @@
+--- a/drivers/ata/pata_rb532_cf.c
++++ b/drivers/ata/pata_rb532_cf.c
+@@ -88,7 +88,7 @@ static unsigned int rb532_pata_data_xfer
  		readsl(ioaddr, buf, buflen / sizeof(u32));
  
  	rb532_pata_finish_io(adev->link->ap);
diff --git a/target/linux/rb532/patches-2.6.28/007-cmdline_hack.patch b/target/linux/rb532/patches-2.6.28/007-cmdline_hack.patch
index 5f2ed2f2f0..1127019fe4 100644
--- a/target/linux/rb532/patches-2.6.28/007-cmdline_hack.patch
+++ b/target/linux/rb532/patches-2.6.28/007-cmdline_hack.patch
@@ -1,6 +1,5 @@
-diff -urN linux-2.6.27.5/arch/mips/kernel/head.S linux-2.6.27.5.new/arch/mips/kernel/head.S
---- linux-2.6.27.5/arch/mips/kernel/head.S	2008-11-15 19:24:03.000000000 +0100
-+++ linux-2.6.27.5.new/arch/mips/kernel/head.S	2008-11-15 19:24:55.000000000 +0100
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
 @@ -123,6 +123,11 @@
  
  	j kernel_entry
diff --git a/target/linux/rb532/patches-2.6.28/008-korina_reset_resource_buffer_size_1536.patch b/target/linux/rb532/patches-2.6.28/008-korina_reset_resource_buffer_size_1536.patch
index 1db2e0ecb1..c1c56d9608 100644
--- a/target/linux/rb532/patches-2.6.28/008-korina_reset_resource_buffer_size_1536.patch
+++ b/target/linux/rb532/patches-2.6.28/008-korina_reset_resource_buffer_size_1536.patch
@@ -9,8 +9,6 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index fefb33d..e30c2f4 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
 @@ -84,7 +84,10 @@
@@ -25,7 +23,3 @@ index fefb33d..e30c2f4 100644
  #define KORINA_RDS_MASK	(KORINA_NUM_RDS - 1)
  #define KORINA_TDS_MASK	(KORINA_NUM_TDS - 1)
  #define RD_RING_SIZE 	(KORINA_NUM_RDS * sizeof(struct dma_desc))
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/009-korina_disable_napi_on_close_and_restart.patch b/target/linux/rb532/patches-2.6.28/009-korina_disable_napi_on_close_and_restart.patch
index 4eec6fd05d..364d307fc4 100644
--- a/target/linux/rb532/patches-2.6.28/009-korina_disable_napi_on_close_and_restart.patch
+++ b/target/linux/rb532/patches-2.6.28/009-korina_disable_napi_on_close_and_restart.patch
@@ -5,11 +5,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index e30c2f4..65b8487 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -904,6 +904,8 @@ static int korina_restart(struct net_device *dev)
+@@ -905,6 +905,8 @@ static int korina_restart(struct net_dev
  
  	korina_free_ring(dev);
  
@@ -18,7 +16,7 @@ index e30c2f4..65b8487 100644
  	ret = korina_init(dev);
  	if (ret < 0) {
  		printk(KERN_ERR DRV_NAME "%s: cannot restart device\n",
-@@ -1070,6 +1072,8 @@ static int korina_close(struct net_device *dev)
+@@ -1071,6 +1073,8 @@ static int korina_close(struct net_devic
  
  	korina_free_ring(dev);
  
@@ -27,7 +25,3 @@ index e30c2f4..65b8487 100644
  	free_irq(lp->rx_irq, dev);
  	free_irq(lp->tx_irq, dev);
  	free_irq(lp->ovr_irq, dev);
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/010-korina_rework_korina_rx.patch b/target/linux/rb532/patches-2.6.28/010-korina_rework_korina_rx.patch
index 177678b988..bfb91a91a4 100644
--- a/target/linux/rb532/patches-2.6.28/010-korina_rework_korina_rx.patch
+++ b/target/linux/rb532/patches-2.6.28/010-korina_rework_korina_rx.patch
@@ -4,9 +4,9 @@ packets and korina_rx is called again (and again and again and ...).
 
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 ---
---- a/drivers/net/korina.c	2009-01-19 23:19:10.000000000 +0100
-+++ b/drivers/net/korina.c	2009-01-19 23:25:31.000000000 +0100
-@@ -353,15 +353,20 @@
+--- a/drivers/net/korina.c
++++ b/drivers/net/korina.c
+@@ -353,15 +353,20 @@ static int korina_rx(struct net_device *
  	struct dma_desc *rd = &lp->rd_ring[lp->rx_next_done];
  	struct sk_buff *skb, *skb_new;
  	u8 *pkt_buf;
@@ -28,7 +28,7 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  		/* Update statistics counters */
  		if (devcs & ETH_RX_CRC)
  			dev->stats.rx_crc_errors++;
-@@ -384,64 +389,53 @@
+@@ -384,64 +389,53 @@ static int korina_rx(struct net_device *
  			 * in Rc32434 (errata ref #077) */
  			dev->stats.rx_errors++;
  			dev->stats.rx_dropped++;
diff --git a/target/linux/rb532/patches-2.6.28/011-korina_do_schedule_napi_after_testing_it.patch b/target/linux/rb532/patches-2.6.28/011-korina_do_schedule_napi_after_testing_it.patch
index c5e1b9a40b..d9e6f33ebe 100644
--- a/target/linux/rb532/patches-2.6.28/011-korina_do_schedule_napi_after_testing_it.patch
+++ b/target/linux/rb532/patches-2.6.28/011-korina_do_schedule_napi_after_testing_it.patch
@@ -5,9 +5,9 @@ Before this change, the driver received absolutely nothing.
 
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 ---
---- a/drivers/net/korina.c	2009-01-19 23:26:19.000000000 +0100
-+++ b/drivers/net/korina.c	2009-01-19 23:27:06.000000000 +0100
-@@ -330,7 +330,7 @@
+--- a/drivers/net/korina.c
++++ b/drivers/net/korina.c
+@@ -330,7 +330,7 @@ static irqreturn_t korina_rx_dma_interru
  
  	dmas = readl(&lp->rx_dma_regs->dmas);
  	if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) {
diff --git a/target/linux/rb532/patches-2.6.28/012-korina_do_tx_at_right_position.patch b/target/linux/rb532/patches-2.6.28/012-korina_do_tx_at_right_position.patch
index 101e869d03..665e09ae48 100644
--- a/target/linux/rb532/patches-2.6.28/012-korina_do_tx_at_right_position.patch
+++ b/target/linux/rb532/patches-2.6.28/012-korina_do_tx_at_right_position.patch
@@ -7,9 +7,9 @@ upstream.
 
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 ---
---- a/drivers/net/korina.c	2009-01-19 23:27:41.000000000 +0100
-+++ b/drivers/net/korina.c	2009-01-19 23:29:08.000000000 +0100
-@@ -330,12 +330,12 @@
+--- a/drivers/net/korina.c
++++ b/drivers/net/korina.c
+@@ -330,12 +330,12 @@ static irqreturn_t korina_rx_dma_interru
  
  	dmas = readl(&lp->rx_dma_regs->dmas);
  	if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) {
@@ -24,7 +24,7 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  
  		if (dmas & DMA_STAT_ERR)
  			printk(KERN_ERR DRV_NAME "%s: DMA error\n", dev->name);
-@@ -621,11 +621,11 @@
+@@ -621,11 +621,11 @@ korina_tx_dma_interrupt(int irq, void *d
  	dmas = readl(&lp->tx_dma_regs->dmas);
  
  	if (dmas & (DMA_STAT_FINI | DMA_STAT_ERR)) {
diff --git a/target/linux/rb532/patches-2.6.28/013-korina_fix_handling_tx_chain_tail.patch b/target/linux/rb532/patches-2.6.28/013-korina_fix_handling_tx_chain_tail.patch
index 6babc3230a..88fcc53a6c 100644
--- a/target/linux/rb532/patches-2.6.28/013-korina_fix_handling_tx_chain_tail.patch
+++ b/target/linux/rb532/patches-2.6.28/013-korina_fix_handling_tx_chain_tail.patch
@@ -10,11 +10,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |   22 +++++++++++-----------
  1 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index dced5e7..f200175 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -199,7 +199,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+@@ -199,7 +199,7 @@ static int korina_send_packet(struct sk_
  	struct korina_private *lp = netdev_priv(dev);
  	unsigned long flags;
  	u32 length;
@@ -23,7 +21,7 @@ index dced5e7..f200175 100644
  	struct dma_desc *td;
  
  	spin_lock_irqsave(&lp->lock, flags);
-@@ -231,8 +231,8 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+@@ -231,8 +231,8 @@ static int korina_send_packet(struct sk_
  	/* Setup the transmit descriptor. */
  	dma_cache_inv((u32) td, sizeof(*td));
  	td->ca = CPHYSADDR(skb->data);
@@ -34,7 +32,7 @@ index dced5e7..f200175 100644
  
  	if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
  		if (lp->tx_chain_status == desc_empty) {
-@@ -240,7 +240,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+@@ -240,7 +240,7 @@ static int korina_send_packet(struct sk_
  			td->control = DMA_COUNT(length) |
  					DMA_DESC_COF | DMA_DESC_IOF;
  			/* Move tail */
@@ -43,7 +41,7 @@ index dced5e7..f200175 100644
  			/* Write to NDPTR */
  			writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
  					&lp->tx_dma_regs->dmandptr);
-@@ -251,12 +251,12 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+@@ -251,12 +251,12 @@ static int korina_send_packet(struct sk_
  			td->control = DMA_COUNT(length) |
  					DMA_DESC_COF | DMA_DESC_IOF;
  			/* Link to prev */
@@ -59,7 +57,7 @@ index dced5e7..f200175 100644
  			/* Write to NDPTR */
  			writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
  					&(lp->tx_dma_regs->dmandptr));
-@@ -270,17 +270,17 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+@@ -270,17 +270,17 @@ static int korina_send_packet(struct sk_
  			td->control = DMA_COUNT(length) |
  					DMA_DESC_COF | DMA_DESC_IOF;
  			/* Move tail */
@@ -81,7 +79,3 @@ index dced5e7..f200175 100644
  		}
  	}
  	dma_cache_wback((u32) td, sizeof(*td));
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/014-korina_do_not_stop_queue_here.patch b/target/linux/rb532/patches-2.6.28/014-korina_do_not_stop_queue_here.patch
index 79ae024b64..bccd307c18 100644
--- a/target/linux/rb532/patches-2.6.28/014-korina_do_not_stop_queue_here.patch
+++ b/target/linux/rb532/patches-2.6.28/014-korina_do_not_stop_queue_here.patch
@@ -7,11 +7,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    1 -
  1 files changed, 0 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index f200175..bd33fa9 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -272,7 +272,6 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
+@@ -272,7 +272,6 @@ static int korina_send_packet(struct sk_
  			/* Move tail */
  			lp->tx_chain_tail = chain_next;
  			lp->tx_chain_status = desc_filled;
@@ -19,7 +17,3 @@ index f200175..bd33fa9 100644
  		} else {
  			/* Update tail */
  			td->control = DMA_COUNT(length) |
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/015-korina_irqf_flags.patch b/target/linux/rb532/patches-2.6.28/015-korina_irqf_flags.patch
index 74059fbeb8..12b8036faa 100644
--- a/target/linux/rb532/patches-2.6.28/015-korina_irqf_flags.patch
+++ b/target/linux/rb532/patches-2.6.28/015-korina_irqf_flags.patch
@@ -8,11 +8,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index bd33fa9..1d6e48e 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -1000,14 +1000,14 @@ static int korina_open(struct net_device *dev)
+@@ -998,14 +998,14 @@ static int korina_open(struct net_device
  	 * that handles the Done Finished
  	 * Ovr and Und Events */
  	ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt,
@@ -29,7 +27,7 @@ index bd33fa9..1d6e48e 100644
  	if (ret < 0) {
  		printk(KERN_ERR DRV_NAME "%s: unable to get Tx DMA IRQ %d\n",
  		    dev->name, lp->tx_irq);
-@@ -1016,7 +1016,7 @@ static int korina_open(struct net_device *dev)
+@@ -1014,7 +1014,7 @@ static int korina_open(struct net_device
  
  	/* Install handler for overrun error. */
  	ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt,
@@ -38,7 +36,7 @@ index bd33fa9..1d6e48e 100644
  	if (ret < 0) {
  		printk(KERN_ERR DRV_NAME"%s: unable to get OVR IRQ %d\n",
  		    dev->name, lp->ovr_irq);
-@@ -1025,7 +1025,7 @@ static int korina_open(struct net_device *dev)
+@@ -1023,7 +1023,7 @@ static int korina_open(struct net_device
  
  	/* Install handler for underflow error. */
  	ret = request_irq(lp->und_irq, &korina_und_interrupt,
@@ -47,7 +45,3 @@ index bd33fa9..1d6e48e 100644
  	if (ret < 0) {
  		printk(KERN_ERR DRV_NAME "%s: unable to get UND IRQ %d\n",
  		    dev->name, lp->und_irq);
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/016-korina_drop_left_over_assignment.patch b/target/linux/rb532/patches-2.6.28/016-korina_drop_left_over_assignment.patch
index ab82cb5afa..19dd71ca72 100644
--- a/target/linux/rb532/patches-2.6.28/016-korina_drop_left_over_assignment.patch
+++ b/target/linux/rb532/patches-2.6.28/016-korina_drop_left_over_assignment.patch
@@ -7,11 +7,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index 60ae7bf..75010ca 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -743,6 +743,7 @@ static struct ethtool_ops netdev_ethtool_ops = {
+@@ -738,6 +738,7 @@ static struct ethtool_ops netdev_ethtool
  static void korina_alloc_ring(struct net_device *dev)
  {
  	struct korina_private *lp = netdev_priv(dev);
@@ -19,7 +17,7 @@ index 60ae7bf..75010ca 100644
  	int i;
  
  	/* Initialize the transmit descriptors */
-@@ -758,8 +759,6 @@ static void korina_alloc_ring(struct net_device *dev)
+@@ -753,8 +754,6 @@ static void korina_alloc_ring(struct net
  
  	/* Initialize the receive descriptors */
  	for (i = 0; i < KORINA_NUM_RDS; i++) {
@@ -28,7 +26,3 @@ index 60ae7bf..75010ca 100644
  		skb = dev_alloc_skb(KORINA_RBSIZE + 2);
  		if (!skb)
  			break;
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/017-korina_fix_loop_back_rx_desc.patch b/target/linux/rb532/patches-2.6.28/017-korina_fix_loop_back_rx_desc.patch
index 0484f2cbe5..5b684b40ca 100644
--- a/target/linux/rb532/patches-2.6.28/017-korina_fix_loop_back_rx_desc.patch
+++ b/target/linux/rb532/patches-2.6.28/017-korina_fix_loop_back_rx_desc.patch
@@ -9,11 +9,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index 1d6e48e..67fbdf4 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -769,11 +769,12 @@ static void korina_alloc_ring(struct net_device *dev)
+@@ -766,11 +766,12 @@ static void korina_alloc_ring(struct net
  		lp->rd_ring[i].link = CPHYSADDR(&lp->rd_ring[i+1]);
  	}
  
@@ -30,7 +28,3 @@ index 1d6e48e..67fbdf4 100644
  	lp->rx_chain_head = 0;
  	lp->rx_chain_tail = 0;
  	lp->rx_chain_status = desc_empty;
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/018-korina_adjust_headroom.patch b/target/linux/rb532/patches-2.6.28/018-korina_adjust_headroom.patch
index f9f8daccc0..4ec3d0e628 100644
--- a/target/linux/rb532/patches-2.6.28/018-korina_adjust_headroom.patch
+++ b/target/linux/rb532/patches-2.6.28/018-korina_adjust_headroom.patch
@@ -8,11 +8,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index 67fbdf4..60ae7bf 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -416,6 +416,9 @@ static int korina_rx(struct net_device *dev, int limit)
+@@ -415,6 +415,9 @@ static int korina_rx(struct net_device *
  			if (devcs & ETH_RX_MP)
  				dev->stats.multicast++;
  
@@ -21,8 +19,4 @@ index 67fbdf4..60ae7bf 100644
 +
  			lp->rx_skb[lp->rx_next_done] = skb_new;
  		}
- 
--- 
-1.5.6.4
-
-
+ 		rd->devcs = 0;
diff --git a/target/linux/rb532/patches-2.6.28/019-korina_set_dev_field_allocated_skb.patch b/target/linux/rb532/patches-2.6.28/019-korina_set_dev_field_allocated_skb.patch
index bec3514885..e54d6113e1 100644
--- a/target/linux/rb532/patches-2.6.28/019-korina_set_dev_field_allocated_skb.patch
+++ b/target/linux/rb532/patches-2.6.28/019-korina_set_dev_field_allocated_skb.patch
@@ -7,19 +7,17 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  drivers/net/korina.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/net/korina.c b/drivers/net/korina.c
-index 75010ca..56b4db2 100644
 --- a/drivers/net/korina.c
 +++ b/drivers/net/korina.c
-@@ -419,6 +419,7 @@ static int korina_rx(struct net_device *dev, int limit)
+@@ -418,6 +418,7 @@ static int korina_rx(struct net_device *
  			/* 16 bit align */
  			skb_reserve(skb_new, 2);
  
 +			skb_new->dev = dev;
  			lp->rx_skb[lp->rx_next_done] = skb_new;
  		}
- 
-@@ -763,6 +764,7 @@ static void korina_alloc_ring(struct net_device *dev)
+ 		rd->devcs = 0;
+@@ -761,6 +762,7 @@ static void korina_alloc_ring(struct net
  		if (!skb)
  			break;
  		skb_reserve(skb, 2);
@@ -27,7 +25,3 @@ index 75010ca..56b4db2 100644
  		lp->rx_skb[i] = skb;
  		lp->rd_ring[i].control = DMA_DESC_IOD |
  				DMA_COUNT(KORINA_RBSIZE);
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/021-rb532_driver_data.patch b/target/linux/rb532/patches-2.6.28/021-rb532_driver_data.patch
index 9aaeef3349..bb4b47001c 100644
--- a/target/linux/rb532/patches-2.6.28/021-rb532_driver_data.patch
+++ b/target/linux/rb532/patches-2.6.28/021-rb532_driver_data.patch
@@ -7,11 +7,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  arch/mips/rb532/devices.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
-index 9b6b744..3c74561 100644
 --- a/arch/mips/rb532/devices.c
 +++ b/arch/mips/rb532/devices.c
-@@ -89,7 +89,7 @@ static struct korina_device korina_dev0_data = {
+@@ -86,7 +86,7 @@ static struct korina_device korina_dev0_
  static struct platform_device korina_dev0 = {
  	.id = -1,
  	.name = "korina",
@@ -20,7 +18,3 @@ index 9b6b744..3c74561 100644
  	.resource = korina_dev0_res,
  	.num_resources = ARRAY_SIZE(korina_dev0_res),
  };
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/022-rb532_uart_autodetect.patch b/target/linux/rb532/patches-2.6.28/022-rb532_uart_autodetect.patch
index ae42a4dbc5..e506103424 100644
--- a/target/linux/rb532/patches-2.6.28/022-rb532_uart_autodetect.patch
+++ b/target/linux/rb532/patches-2.6.28/022-rb532_uart_autodetect.patch
@@ -8,8 +8,6 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
  arch/mips/rb532/serial.c  |    2 +-
  2 files changed, 27 insertions(+), 1 deletions(-)
 
-diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
-index c1c2918..9b6b744 100644
 --- a/arch/mips/rb532/devices.c
 +++ b/arch/mips/rb532/devices.c
 @@ -24,6 +24,7 @@
@@ -29,7 +27,7 @@ index c1c2918..9b6b744 100644
  static struct resource korina_dev0_res[] = {
  	{
  		.name = "korina_regs",
-@@ -214,12 +217,32 @@ static struct platform_device rb532_wdt = {
+@@ -214,12 +217,32 @@ static struct platform_device rb532_wdt 
  	.num_resources	= ARRAY_SIZE(rb532_wdt_res),
  };
  
@@ -62,7 +60,7 @@ index c1c2918..9b6b744 100644
  	&rb532_wdt
  };
  
-@@ -294,6 +317,9 @@ static int __init plat_setup_devices(void)
+@@ -294,6 +317,9 @@ static int __init plat_setup_devices(voi
  	/* Initialise the NAND device */
  	rb532_nand_setup();
  
@@ -72,8 +70,6 @@ index c1c2918..9b6b744 100644
  	return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));
  }
  
-diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c
-index 3e0d7ec..00ed19f 100644
 --- a/arch/mips/rb532/serial.c
 +++ b/arch/mips/rb532/serial.c
 @@ -36,7 +36,7 @@
@@ -85,7 +81,3 @@ index 3e0d7ec..00ed19f 100644
  	.line = 0,
  	.irq = UART0_IRQ,
  	.iotype = UPIO_MEM,
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/023-rb532_fix_init_of_rb532_dev3_ctl_res.patch b/target/linux/rb532/patches-2.6.28/023-rb532_fix_init_of_rb532_dev3_ctl_res.patch
index 64a6d8934e..ab60afc1e8 100644
--- a/target/linux/rb532/patches-2.6.28/023-rb532_fix_init_of_rb532_dev3_ctl_res.patch
+++ b/target/linux/rb532/patches-2.6.28/023-rb532_fix_init_of_rb532_dev3_ctl_res.patch
@@ -3,11 +3,9 @@ initialisation has to be the same as cf_slot0_res and nand_slot0_res.
 
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 ---
-diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
-index d75eb19..40deb11 100644
 --- a/arch/mips/rb532/gpio.c
 +++ b/arch/mips/rb532/gpio.c
-@@ -55,8 +55,6 @@ static struct resource rb532_gpio_reg0_res[] = {
+@@ -55,8 +55,6 @@ static struct resource rb532_gpio_reg0_r
  static struct resource rb532_dev3_ctl_res[] = {
  	{
  		.name	= "dev3_ctl",
@@ -16,7 +14,7 @@ index d75eb19..40deb11 100644
  		.flags	= IORESOURCE_MEM,
  	}
  };
-@@ -243,6 +241,9 @@ int __init rb532_gpio_init(void)
+@@ -251,6 +249,9 @@ int __init rb532_gpio_init(void)
  	/* Register our GPIO chip */
  	gpiochip_add(&rb532_gpio_chip->chip);
  
@@ -26,7 +24,3 @@ index d75eb19..40deb11 100644
  	r = rb532_dev3_ctl_res;
  	dev3.base = ioremap_nocache(r->start, r->end - r->start);
  
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/024-rb532_fix_set_latch_u5.patch b/target/linux/rb532/patches-2.6.28/024-rb532_fix_set_latch_u5.patch
index fc0c77ec25..edad9d8687 100644
--- a/target/linux/rb532/patches-2.6.28/024-rb532_fix_set_latch_u5.patch
+++ b/target/linux/rb532/patches-2.6.28/024-rb532_fix_set_latch_u5.patch
@@ -4,11 +4,9 @@ is wrong.
 
 Signed-off-by: Phil Sutter <n0-1@freewrt.org>
 ---
-diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
-index 40deb11..7e0cb4f 100644
 --- a/arch/mips/rb532/gpio.c
 +++ b/arch/mips/rb532/gpio.c
-@@ -93,7 +93,7 @@ void set_latch_u5(unsigned char or_mask, unsigned char nand_mask)
+@@ -93,7 +93,7 @@ void set_latch_u5(unsigned char or_mask,
  	spin_lock_irqsave(&dev3.lock, flags);
  
  	dev3.state = (dev3.state | or_mask) & ~nand_mask;
@@ -17,7 +15,3 @@ index 40deb11..7e0cb4f 100644
  
  	spin_unlock_irqrestore(&dev3.lock, flags);
  }
--- 
-1.5.6.4
-
-
diff --git a/target/linux/rb532/patches-2.6.28/025-rb532_nand_fixup.patch b/target/linux/rb532/patches-2.6.28/025-rb532_nand_fixup.patch
index 7091609803..3c7cccacba 100644
--- a/target/linux/rb532/patches-2.6.28/025-rb532_nand_fixup.patch
+++ b/target/linux/rb532/patches-2.6.28/025-rb532_nand_fixup.patch
@@ -1,6 +1,6 @@
---- a/arch/mips/rb532/devices.c	2009-01-25 13:36:15.000000000 +0100
-+++ b/arch/mips/rb532/devices.c	2009-01-25 14:00:56.000000000 +0100
-@@ -119,6 +119,19 @@
+--- a/arch/mips/rb532/devices.c
++++ b/arch/mips/rb532/devices.c
+@@ -119,6 +119,19 @@ static struct platform_device cf_slot0 =
  };
  
  /* Resources and device for NAND */
@@ -20,7 +20,7 @@
  static int rb532_dev_ready(struct mtd_info *mtd)
  {
  	return gpio_get_value(GPIO_RDY);
-@@ -277,6 +290,16 @@
+@@ -277,6 +290,16 @@ static void __init parse_mac_addr(char *
  /* NAND definitions */
  #define NAND_CHIP_DELAY	25
  
@@ -37,7 +37,7 @@
  static void __init rb532_nand_setup(void)
  {
  	switch (mips_machtype) {
-@@ -296,6 +319,8 @@
+@@ -296,6 +319,8 @@ static void __init rb532_nand_setup(void
  	rb532_nand_data.chip.partitions = rb532_partition_info;
  	rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
  	rb532_nand_data.chip.options = NAND_NO_AUTOINCR;