[kernel/2.6.38] refresh patches

[openwrt.git] / target / linux / cns3xxx / patches / 051-cns3xxx_gigabit.patch

diff --git a/target/linux/cns3xxx/patches/051-cns3xxx_gigabit.patch b/target/linux/cns3xxx/patches/051-cns3xxx_gigabit.patch
index ddc499e..cf67e92 100644 (file)
--- a/target/linux/cns3xxx/patches/051-cns3xxx_gigabit.patch
+++ b/target/linux/cns3xxx/patches/051-cns3xxx_gigabit.patch
@@ -44,12 +44,14 @@
 +#include <linux/dma-mapping.h>
 +#include <linux/dmapool.h>
 +#include <linux/etherdevice.h>
 +#include <linux/dma-mapping.h>
 +#include <linux/dmapool.h>
 +#include <linux/etherdevice.h>

++#include <linux/interrupt.h>

 +#include <linux/io.h>
 +#include <linux/kernel.h>
 +#include <linux/phy.h>
 +#include <linux/platform_device.h>
 +#include <linux/skbuff.h>
 +#include <linux/io.h>
 +#include <linux/kernel.h>
 +#include <linux/phy.h>
 +#include <linux/platform_device.h>
 +#include <linux/skbuff.h>

-+#include <mach/hardware.h>
++#include <mach/irqs.h>
++#include <mach/platform.h>

 +
 +#define DRV_NAME "cns3xxx_eth"
 +
 +
 +#define DRV_NAME "cns3xxx_eth"
 +


@@ -212,7 +214,6 @@
 +      u8 alignment[16]; /* for 32 byte alignment */
 +};
 +
 +      u8 alignment[16]; /* for 32 byte alignment */
 +};
 +

-+

 +struct switch_regs {
 +      u32 phy_control;
 +      u32 phy_auto_addr;
 +struct switch_regs {
 +      u32 phy_control;
 +      u32 phy_auto_addr;


@@ -439,7 +440,6 @@
 +      return (IRQ_HANDLED);
 +}
 +
 +      return (IRQ_HANDLED);
 +}
 +

-+

 +static void cns3xxx_alloc_rx_buf(struct sw *sw, int received)
 +{
 +      struct _rx_ring *rx_ring = sw->rx_ring;
 +static void cns3xxx_alloc_rx_buf(struct sw *sw, int received)
 +{
 +      struct _rx_ring *rx_ring = sw->rx_ring;


@@ -1297,15 +1297,6 @@
 +MODULE_DESCRIPTION("Cavium CNS3xxx Ethernet driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:cns3xxx_eth");
 +MODULE_DESCRIPTION("Cavium CNS3xxx Ethernet driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:cns3xxx_eth");

---- a/arch/arm/mach-cns3xxx/include/mach/hardware.h
-+++ b/arch/arm/mach-cns3xxx/include/mach/hardware.h
-@@ -19,4 +19,6 @@
- #define PCIBIOS_MIN_MEM               0x00000000
- #define pcibios_assign_all_busses()   1
- 
-+#include "platform.h"
-+
- #endif

 --- /dev/null
 +++ b/arch/arm/mach-cns3xxx/include/mach/platform.h
 @@ -0,0 +1,26 @@
 --- /dev/null
 +++ b/arch/arm/mach-cns3xxx/include/mach/platform.h
 @@ -0,0 +1,26 @@