# This is a BitKeeper generated patch for the following project:
# Project Name: Linux 2.4
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.132   -> 1.133  
#	arch/ppc/configs/k2_defconfig	1.1     -> 1.2    
#	arch/ppc/kernel/k2_pci.c	1.1     -> 1.2    
#	arch/ppc/kernel/k2_setup.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 01/06/07	trini@opus.bloom.county	1.133
# K2 updates.
# --------------------------------------------
#
diff -Nru a/arch/ppc/configs/k2_defconfig b/arch/ppc/configs/k2_defconfig
--- a/arch/ppc/configs/k2_defconfig	Thu Jun  7 12:27:26 2001
+++ b/arch/ppc/configs/k2_defconfig	Thu Jun  7 12:27:26 2001
@@ -30,12 +30,20 @@
 # CONFIG_ALL_PPC is not set
 # CONFIG_APUS is not set
 # CONFIG_SPRUCE is not set
+# CONFIG_PCORE is not set
+# CONFIG_MENF1 is not set
+# CONFIG_MCPN765 is not set
+# CONFIG_MVME5100 is not set
+# CONFIG_PRPMC750 is not set
+# CONFIG_SANDPOINT is not set
 CONFIG_K2=y
 # CONFIG_GEMINI is not set
+# CONFIG_ZX4500 is not set
+# CONFIG_CPC710_DATA_GATHERING is not set
 # CONFIG_PPC601_SYNC_FIX is not set
 # CONFIG_SMP is not set
 # CONFIG_ALTIVEC is not set
-CONFIG_MACH_SPECIFIC=y
+# CONFIG_TAU is not set
 
 #
 # General setup
@@ -63,7 +71,8 @@
 #
 # CONFIG_PARPORT is not set
 CONFIG_PPC_RTC=y
-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="ip=on"
 
 #
 # Memory Technology Devices (MTD)
@@ -118,7 +127,8 @@
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
@@ -309,6 +319,7 @@
 CONFIG_EEPRO100=y
 # CONFIG_EEPRO100_PM is not set
 # CONFIG_LNE390 is not set
+# CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NE3210 is not set
@@ -475,6 +486,7 @@
 # CONFIG_ISO9660_FS is not set
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
diff -Nru a/arch/ppc/kernel/k2_pci.c b/arch/ppc/kernel/k2_pci.c
--- a/arch/ppc/kernel/k2_pci.c	Thu Jun  7 12:27:26 2001
+++ b/arch/ppc/kernel/k2_pci.c	Thu Jun  7 12:27:26 2001
@@ -182,6 +182,7 @@
 	hose_a->first_busno = 0;
 	hose_a->last_busno = 0xff;
 	hose_a->pci_mem_offset = K2_PCI32_MEM_BASE;
+	hose_a->mem_resources[0].end = 0xffffffff;
 	hose_a->io_space.start = K2_PCI32_LOWER_IO;
 	hose_a->io_space.end = K2_PCI32_UPPER_IO;
 	hose_a->mem_space.start = K2_PCI32_LOWER_MEM;
@@ -223,6 +224,7 @@
 		hose_b->last_busno = 0xff;
 		/* Reminder: quit changing the following, it is correct. */
 		hose_b->pci_mem_offset = K2_PCI32_MEM_BASE;
+		hose_b->mem_resources[0].end = 0xffffffff;
 		hose_b->io_space.start = K2_PCI64_LOWER_IO;
 		hose_b->io_space.end = K2_PCI64_UPPER_IO;
 		hose_b->mem_space.start = K2_PCI64_LOWER_MEM;
@@ -256,6 +258,15 @@
 				CPC710_SUB_BUS_NUMBER,
 				hose_b->last_busno);
 	}
+
+#ifdef CONFIG_CPC710_DATA_GATHERING
+	{
+		unsigned int tmp;
+		tmp = __raw_readl(ABCNTL);
+		/* Enable data gathering on both PCI interfaces */
+		__raw_writel(tmp | 0x05000000, ABCNTL);
+	}
+#endif
 
 	ppc_md.pcibios_fixup = k2_pcibios_fixup;
 	ppc_md.pcibios_fixup_resources = k2_pcibios_fixup_resources;
diff -Nru a/arch/ppc/kernel/k2_setup.c b/arch/ppc/kernel/k2_setup.c
--- a/arch/ppc/kernel/k2_setup.c	Thu Jun  7 12:27:26 2001
+++ b/arch/ppc/kernel/k2_setup.c	Thu Jun  7 12:27:26 2001
@@ -285,12 +285,15 @@
        /* Setup PCI host bridges */
         k2_find_bridges();
 
+#ifdef CONFIG_BLK_DEV_INITRD
+	if (initrd_start)
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); /* /dev/ram */
+	else
+#endif
 #ifdef CONFIG_ROOT_NFS
-	/* bootable from nfsroot */
-	ROOT_DEV = to_kdev_t(0x00FF);	/* /dev/nfs pseudo device */
+		ROOT_DEV = to_kdev_t(0x00FF);	/* /dev/nfs pseudo device */
 #else
-	/* bootable from IDE secondary master */
-	ROOT_DEV = to_kdev_t(0x1601);	/* /dev/hdc1 */
+		ROOT_DEV = to_kdev_t(0x1601);	/* /dev/hdc1 */
 #endif
 
 	/* Identify the system */