diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 10:17:03 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 10:17:03 +0000 |
| commit | 60289aade7304b10112a6839dcf293e719f057eb (patch) | |
| tree | b992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch | |
| parent | 9fcaee9fccd3fc3605de7c3578013211b8486827 (diff) | |
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch index f2f53a0bc..4faad529a 100644 --- a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch +++ b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch @@ -1,7 +1,7 @@ -diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig -index f9cc2b6..8eda6ee 100644 ---- a/drivers/net/arm/Kconfig -+++ b/drivers/net/arm/Kconfig +Index: linux-2.6.25.1/drivers/net/arm/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/arm/Kconfig ++++ linux-2.6.25.1/drivers/net/arm/Kconfig @@ -47,3 +47,11 @@ config EP93XX_ETH help This is a driver for the ethernet hardware included in EP93xx CPUs. @@ -14,20 +14,19 @@ index f9cc2b6..8eda6ee 100644 + help + Say Y here if you want to use built-in Ethernet ports + on IXP4xx processor. -diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile -index a4c8682..7c812ac 100644 ---- a/drivers/net/arm/Makefile -+++ b/drivers/net/arm/Makefile +Index: linux-2.6.25.1/drivers/net/arm/Makefile +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/arm/Makefile ++++ linux-2.6.25.1/drivers/net/arm/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o +obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o -diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c -new file mode 100644 -index 0000000..c617b64 +Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +=================================================================== --- /dev/null -+++ b/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c @@ -0,0 +1,1265 @@ +/* + * Intel IXP4xx Ethernet driver for Linux @@ -1294,11 +1293,11 @@ index 0000000..c617b64 +MODULE_ALIAS("platform:ixp4xx_eth"); +module_init(eth_init_module); +module_exit(eth_cleanup_module); -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -index 83c137e..63a23fa 100644 ---- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c -+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what) +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co return -ETIMEDOUT; } @@ -1308,7 +1307,7 @@ index 83c137e..63a23fa 100644 return 0; } -@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what) +@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, vo return -ETIMEDOUT; } @@ -1318,11 +1317,11 @@ index 83c137e..63a23fa 100644 return 0; } -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -index e833013..fab94ea 100644 ---- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue) +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int que case 3: mask[0] = 0xFF; break; } |