patch-2.4.25 linux-2.4.25/arch/ppc/configs/SM850_defconfig

• Lines: 25
• Date: 2004-02-18 05:36:30.000000000 -0800
• Orig file: linux-2.4.24/arch/ppc/configs/SM850_defconfig
• Orig date: 2003-11-28 10:26:19.000000000 -0800

diff -urN linux-2.4.24/arch/ppc/configs/SM850_defconfig linux-2.4.25/arch/ppc/configs/SM850_defconfig
@@ -70,6 +70,7 @@
 CONFIG_BINFMT_ELF=y
 CONFIG_KERNEL_ELF=y
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_OOM_KILLER is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 
@@ -181,7 +182,6 @@
 # ATA/IDE/MFM/RLL support
 #
 # CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -489,7 +489,7 @@
 CONFIG_SCC3_ENET=y
 # CONFIG_FEC_ENET is not set
 CONFIG_ENET_BIG_BUFFERS=y
-CONFIG_SMC2_UART=y
+CONFIG_8xx_SMC2=y
 CONFIG_ALTSMC2=y
 CONFIG_CONS_SMC2=y
 # CONFIG_8xx_SCC1 is not set