[kernel] r10510 - in dists/trunk/linux-2.6/debian/patches: features/arm series

[Gordon Farquharson]

Author: gordon-guest
Date: Tue Feb 12 06:03:22 2008
New Revision: 10510

Log:
arm/ixp4xx: Refresh patch and update series file.


Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-drivers.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-drivers.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-drivers.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-drivers.patch	Tue Feb 12 06:03:22 2008
@@ -27,10 +27,10 @@
 +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..b654060
+index 0000000..0ee490b
 --- /dev/null
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -0,0 +1,1261 @@
+@@ -0,0 +1,1262 @@
 +/*
 + * Intel IXP4xx Ethernet driver for Linux
 + *
@@ -1290,5 +1290,6 @@
 +MODULE_AUTHOR("Krzysztof Halasa");
 +MODULE_DESCRIPTION("Intel IXP4xx Ethernet driver");
 +MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:ixp4xx_eth");
 +module_init(eth_init_module);
 +module_exit(eth_cleanup_module);

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Tue Feb 12 06:03:22 2008
@@ -16,7 +16,7 @@
 + bugfix/powerpc/prep-utah-ide-interrupt.patch
 + bugfix/powerpc/serial.patch
 + bugfix/mips/tulip_mwi_fix.patch
-#+ features/arm/ixp4xx-net-drivers.patch
++ features/arm/ixp4xx-net-drivers.patch
 + bugfix/sparc/drivers_net-broken.patch
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch