[kernel] r5163 - dists/trunk/linux-2.6/debian/patches-debian

[Sven Luther]

Author: luther
Date: Sun Jan  1 17:31:09 2006
New Revision: 5163

Modified:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-hotplug-support.patch
Log:
Rediffed the mv643xx-hotplug-support patch.


Modified: dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-hotplug-support.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-hotplug-support.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-hotplug-support.patch	Sun Jan  1 17:31:09 2006
@@ -5,31 +5,31 @@
 # cleanup in order to not break embedded arches using this controller, but
 # should not be a worry for debian.
 #
---- linux-2.6.14-rc1/drivers/net/mv643xx_eth.c	2005-09-14 08:15:11.000065096 +0200
-+++ linux-2.6.14-rc1_nico/drivers/net/mv643xx_eth.c	2005-09-15 12:57:50.646269250 +0200
-@@ -1533,6 +1533,9 @@
- 	printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
- #endif
+--- drivers/net/mv643xx_eth.c.orig	2006-01-01 17:22:07.000000000 +0000
++++ drivers/net/mv643xx_eth.c	2006-01-01 17:23:56.000000000 +0000
+@@ -41,6 +41,8 @@
+ #include <linux/ethtool.h>
+ #include <linux/platform_device.h>
  
-+	if (mp->tx_sram_size > 0)
-+		printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
++#include <linux/pci.h>
 +
- 	return 0;
- 
- out:
-@@ -1640,6 +1643,15 @@
+ #include <asm/io.h>
+ #include <asm/types.h>
+ #include <asm/pgtable.h>
+@@ -1635,6 +1637,15 @@
  		" and Dale Farnsworth");
  MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
  
-+#include <linux/pci.h>
-+
 +static struct pci_device_id pci_marvell_mv64360[] = {
-+		{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },
-+		{ }
-+	};
++	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64460) },
++	{ }
++};
 +
 +MODULE_DEVICE_TABLE(pci, pci_marvell_mv64360);
 +
++
  /*
   * The second part is the low level driver of the gigE ethernet ports.
   */
+