Merge branch 'pele-peep4' of /home/linnj/linux_arm/devel/linux-2.6-xlnx-peep4-debug...

diff --git a/arch/arm/configs/xilinx_defconfig b/arch/arm/configs/xilinx_defconfig
index 255dbaa43f1233339d9da0d03913cb8fe5cbc70f..dcc5e7e135ae779a701de2ed0fc8745a2ec4e1af 100644 (file)
--- a/arch/arm/configs/xilinx_defconfig
+++ b/arch/arm/configs/xilinx_defconfig
@@ -320,7 +320,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyDF0,9600n8 root=/dev/ram rw initrd=0x00800000,8M earlyprintk mtdparts=physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
+CONFIG_CMDLINE="console=ttyDF0,9600n8 root=/dev/ram rw initrd=0x00800000,16M earlyprintk mtdparts=physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 

diff --git a/arch/arm/configs/xilinx_smp_defconfig b/arch/arm/configs/xilinx_smp_defconfig
index 7d10038f138dde077ef02cd0e5f2ab89d17a3b32..e5fa657eabc537366f1c5c35d5d9ffb84ce71132 100644 (file)
--- a/arch/arm/configs/xilinx_smp_defconfig
+++ b/arch/arm/configs/xilinx_smp_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Fri Aug 20 11:38:09 2010
+# Fri Aug 20 11:43:23 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -325,7 +325,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyDF0,9600n8 root=/dev/ram rw initrd=0x00800000,8M earlyprintk mtdparts=physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
+CONFIG_CMDLINE="console=ttyDF0,9600n8 root=/dev/ram rw initrd=0x00800000,16M earlyprintk mtdparts=physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 

diff --git a/drivers/net/xilinx_emacpss.c b/drivers/net/xilinx_emacpss.c
index 1c1a2f65c3b5c3f3791be24a807e9d0b7a23e0e5..c0960c855c568fc655ce51b4bbccb237d7c0b7db 100755 (executable)
--- a/drivers/net/xilinx_emacpss.c
+++ b/drivers/net/xilinx_emacpss.c
@@ -86,7 +86,6 @@ MDC_DIV_64, MDC_DIV_96, MDC_DIV_128, MDC_DIV_224 };
  * BD Space needed is (XEMACPSS_SEND_BD_CNT+XEMACPSS_RECV_BD_CNT)*8
  */
 #undef  DEBUG
-#define DEBUG
 #define DEBUG_SPEED
 
 #define XEMACPSS_SEND_BD_CNT   32