# 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.135   -> 1.136  
#	arch/ppc/kernel/mvme5100_pci.c	1.1     -> 1.2    
#	arch/ppc/configs/mvme5100_defconfig	1.1     -> 1.2    
#	arch/ppc/kernel/mvme5100_setup.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 01/06/07	trini@opus.bloom.county	1.136
# Update Motorola MVME5100.
# --------------------------------------------
#
diff -Nru a/arch/ppc/configs/mvme5100_defconfig b/arch/ppc/configs/mvme5100_defconfig
--- a/arch/ppc/configs/mvme5100_defconfig	Thu Jun  7 12:27:53 2001
+++ b/arch/ppc/configs/mvme5100_defconfig	Thu Jun  7 12:27:53 2001
@@ -30,14 +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=y
+# CONFIG_PRPMC750 is not set
+# CONFIG_SANDPOINT is not set
 # CONFIG_K2 is not set
 # CONFIG_GEMINI is not set
+# CONFIG_ZX4500 is not set
 # CONFIG_MVME5100_IPMC761_PRESENT is not set
 # CONFIG_PPC601_SYNC_FIX is not set
 # CONFIG_SMP is not set
 CONFIG_ALTIVEC=y
-CONFIG_MACH_SPECIFIC=y
+# CONFIG_TAU is not set
 
 #
 # General setup
@@ -65,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)
@@ -87,7 +94,7 @@
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
-CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -120,7 +127,8 @@
 CONFIG_IP_MULTICAST=y
 # 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
@@ -387,6 +395,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
@@ -553,6 +562,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/mvme5100_pci.c b/arch/ppc/kernel/mvme5100_pci.c
--- a/arch/ppc/kernel/mvme5100_pci.c	Thu Jun  7 12:27:53 2001
+++ b/arch/ppc/kernel/mvme5100_pci.c	Thu Jun  7 12:27:53 2001
@@ -92,6 +92,7 @@
 	hose->first_busno = 0;
 	hose->last_busno = 0xff;
 	hose->pci_mem_offset = MVME5100_PCI_MEM_OFFSET;
+	hose->mem_resources[0].end = 0xffffffff;
 	hose->io_base_virt = (void *)MVME5100_ISA_IO_BASE;
 
 	/* Use indirect method of Hawk */
diff -Nru a/arch/ppc/kernel/mvme5100_setup.c b/arch/ppc/kernel/mvme5100_setup.c
--- a/arch/ppc/kernel/mvme5100_setup.c	Thu Jun  7 12:27:53 2001
+++ b/arch/ppc/kernel/mvme5100_setup.c	Thu Jun  7 12:27:53 2001
@@ -84,13 +84,13 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start)
-		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); /* /dev/ram */
 	else
 #endif
 #ifdef	CONFIG_ROOT_NFS
 		ROOT_DEV = to_kdev_t(0x00FF);	/* /dev/nfs pseudo device */
 #else
-		ROOT_DEV = to_kdev_t(0x0802);	/* /dev/sda2 SCSI disk */
+		ROOT_DEV = to_kdev_t(0x0802);	/* /dev/sda2 */
 #endif
 
 	if ( ppc_md.progress )
@@ -104,7 +104,7 @@
 	OpenPIC_InitSenses = mvme5100_openpic_initsenses;
 	OpenPIC_NumInitSenses = sizeof(mvme5100_openpic_initsenses);
 
-	printk("MVME5100 port (C) 2001 MontaVista Software, Inc. <source@mvista.com>\n");
+	printk("MVME5100 port (C) 2001 MontaVista Software, Inc. (source@mvista.com)\n");
 
 	if ( ppc_md.progress )
 		ppc_md.progress("mvme5100_setup_arch: exit", 0);