# 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.137   -> 1.138  
#	arch/ppc/kernel/zx4500_setup.c	1.2     -> 1.3    
#	arch/ppc/configs/zx4500_defconfig	1.1     -> 1.2    
#	arch/ppc/kernel/zx4500_pci.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 01/06/07	trini@opus.bloom.county	1.138
# Update Zynx ZX4500.
# --------------------------------------------
#
diff -Nru a/arch/ppc/configs/zx4500_defconfig b/arch/ppc/configs/zx4500_defconfig
--- a/arch/ppc/configs/zx4500_defconfig	Thu Jun  7 12:28:13 2001
+++ b/arch/ppc/configs/zx4500_defconfig	Thu Jun  7 12:28:13 2001
@@ -39,9 +39,11 @@
 # CONFIG_K2 is not set
 # CONFIG_GEMINI is not set
 CONFIG_ZX4500=y
+# CONFIG_MPC10X_STORE_GATHERING is not set
 # CONFIG_PPC601_SYNC_FIX is not set
 # CONFIG_SMP is not set
 # CONFIG_ALTIVEC is not set
+# CONFIG_TAU is not set
 
 #
 # General setup
@@ -123,6 +125,7 @@
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
@@ -216,6 +219,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
@@ -387,6 +391,7 @@
 CONFIG_ISO9660_FS=y
 # 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/zx4500_pci.c b/arch/ppc/kernel/zx4500_pci.c
--- a/arch/ppc/kernel/zx4500_pci.c	Thu Jun  7 12:28:13 2001
+++ b/arch/ppc/kernel/zx4500_pci.c	Thu Jun  7 12:28:13 2001
@@ -105,6 +105,8 @@
 			       MPC10X_MEM_MAP_B,
 			       MPC10X_MEM_MAP_B,
 			       MPC10X_MAPB_EUMB_BASE) == 0) {
+
+		hose->mem_resources[0].end = 0xffffffff;
 	
 		/* Initialize the board */
 		zx4500_board_init(hose);
diff -Nru a/arch/ppc/kernel/zx4500_setup.c b/arch/ppc/kernel/zx4500_setup.c
--- a/arch/ppc/kernel/zx4500_setup.c	Thu Jun  7 12:28:13 2001
+++ b/arch/ppc/kernel/zx4500_setup.c	Thu Jun  7 12:28:13 2001
@@ -85,8 +85,6 @@
 };
 
 
-extern char cmd_line[];
-
 static void __init
 zx4500_setup_arch(void)
 {
@@ -134,7 +132,6 @@
 	}
 
 	/* nothing but serial consoles... */  
-	printk("Boot arguments: %s\n", cmd_line);
 	printk("Znyx ZX4500 Series High Performance Switch\n");
 	printk("ZX4500 port (C) 2000, 2001 MontaVista Software, Inc. (source@mvista.com)\n");