r2698 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[Sven Luther]

Author: luther
Date: 2005-03-14 09:35:16 +0100 (Mon, 14 Mar 2005)
New Revision: 2698

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch
Log:
Adapted the powerpc-mv643xx-eth-pegasos.dpatch patch to do pci_find_devices,
since we don't really have some nice OF field to match against.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch	2005-03-14 08:03:37 UTC (rev 2697)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-mv643xx-eth-pegasos.dpatch	2005-03-14 08:35:16 UTC (rev 2698)
@@ -21,7 +21,7 @@
  obj-$(CONFIG_NVRAM)		+= pmac_nvram.o
 --- linux-dale/arch/ppc/platforms/mv643xx_eth_pegasos.c	1970-01-01 01:00:00.000000000 +0100
 +++ kernel-source-2.6.11-marvell/arch/ppc/platforms/mv643xx_eth_pegasos.c	2005-03-08 20:21:33.000000000 +0100
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,105 @@
 +/*
 + *  arch/ppc/platforms/mv643xx_eth_pegasos.c
 + *
@@ -120,16 +120,9 @@
 +mv643xx_eth_add_pds(void)
 +{
 +	int ret = 0;
-+	struct device_node *np;
-+	np = find_devices("host");
-+	if (np != NULL) {
-+		unsigned short *vendorid = (unsigned short *) get_property (np, "vendor-id", NULL);
-+		unsigned short *deviceid = (unsigned short *) get_property (np, "device-id", NULL);
-+		
-+		if (vendorid && *vendorid == PCI_VENDOR_ID_MARVELL &&
-+		    deviceid && *deviceid == PCI_DEVICE_ID_MARVELL_MV64360)
-+			ret = platform_add_devices(mv643xx_eth_pd_devs,
-+				ARRAY_SIZE(mv643xx_eth_pd_devs));
++	if (pci_find_device(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360, NULL)) {
++		ret = platform_add_devices(mv643xx_eth_pd_devs,
++			ARRAY_SIZE(mv643xx_eth_pd_devs));
 +	}
 +	return ret;
 +}