From: Geert Uytterhoeven M68k: Update defconfigs for 2.6.10 Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton --- 25-akpm/arch/m68k/configs/amiga_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/apollo_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/atari_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/bvme6000_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/hp300_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/mac_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/mvme147_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/mvme16x_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/q40_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/sun3_defconfig | 9 +++++++-- 25-akpm/arch/m68k/configs/sun3x_defconfig | 9 +++++++-- 25-akpm/arch/m68k/defconfig | 9 +++++++-- 12 files changed, 84 insertions(+), 24 deletions(-) diff -puN arch/m68k/configs/amiga_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/amiga_defconfig --- 25/arch/m68k/configs/amiga_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.132914112 -0800 +++ 25-akpm/arch/m68k/configs/amiga_defconfig 2005-01-10 17:29:26.152911072 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:25 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:22:54 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -731,6 +731,11 @@ CONFIG_DMASOUND=m # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_AMIGA_BUILTIN_SERIAL=y diff -puN arch/m68k/configs/apollo_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/apollo_defconfig --- 25/arch/m68k/configs/apollo_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.134913808 -0800 +++ 25-akpm/arch/m68k/configs/apollo_defconfig 2005-01-10 17:29:26.152911072 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:29 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:22:58 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -590,6 +590,11 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_DN_SERIAL=y diff -puN arch/m68k/configs/atari_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/atari_defconfig --- 25/arch/m68k/configs/atari_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.135913656 -0800 +++ 25-akpm/arch/m68k/configs/atari_defconfig 2005-01-10 17:29:26.153910920 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:34 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:11 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -643,6 +643,11 @@ CONFIG_DMASOUND=m # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_ATARI_MFPSER=m diff -puN arch/m68k/configs/bvme6000_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/bvme6000_defconfig --- 25/arch/m68k/configs/bvme6000_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.137913352 -0800 +++ 25-akpm/arch/m68k/configs/bvme6000_defconfig 2005-01-10 17:29:26.154910768 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:38 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:15 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -589,6 +589,11 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_BVME6000_SCC=y diff -puN arch/m68k/configs/hp300_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/hp300_defconfig --- 25/arch/m68k/configs/hp300_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.138913200 -0800 +++ 25-akpm/arch/m68k/configs/hp300_defconfig 2005-01-10 17:29:26.155910616 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:44 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:40 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -591,6 +591,11 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # diff -puN arch/m68k/configs/mac_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/mac_defconfig --- 25/arch/m68k/configs/mac_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.140912896 -0800 +++ 25-akpm/arch/m68k/configs/mac_defconfig 2005-01-10 17:29:26.155910616 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:47 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:44 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -652,6 +652,11 @@ CONFIG_LOGO_MAC_CLUT224=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_MAC_SCC=y diff -puN arch/m68k/configs/mvme147_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/mvme147_defconfig --- 25/arch/m68k/configs/mvme147_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.141912744 -0800 +++ 25-akpm/arch/m68k/configs/mvme147_defconfig 2005-01-10 17:29:26.156910464 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:49 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:49 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -606,6 +606,11 @@ CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_MVME147_SCC=y diff -puN arch/m68k/configs/mvme16x_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/mvme16x_defconfig --- 25/arch/m68k/configs/mvme16x_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.143912440 -0800 +++ 25-akpm/arch/m68k/configs/mvme16x_defconfig 2005-01-10 17:29:26.157910312 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:52 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:53 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -605,6 +605,11 @@ CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_MVME162_SCC=y diff -puN arch/m68k/configs/q40_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/q40_defconfig --- 25/arch/m68k/configs/q40_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.144912288 -0800 +++ 25-akpm/arch/m68k/configs/q40_defconfig 2005-01-10 17:29:26.157910312 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:55 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:57 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -682,6 +682,11 @@ CONFIG_DMASOUND=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # diff -puN arch/m68k/configs/sun3_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/sun3_defconfig --- 25/arch/m68k/configs/sun3_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.145912136 -0800 +++ 25-akpm/arch/m68k/configs/sun3_defconfig 2005-01-10 17:29:26.158910160 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:58 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:24:01 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -595,6 +595,11 @@ CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # diff -puN arch/m68k/configs/sun3x_defconfig~m68k-update-defconfigs-for-2610 arch/m68k/configs/sun3x_defconfig --- 25/arch/m68k/configs/sun3x_defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.147911832 -0800 +++ 25-akpm/arch/m68k/configs/sun3x_defconfig 2005-01-10 17:29:26.159910008 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:22:01 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:24:05 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -605,6 +605,11 @@ CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # diff -puN arch/m68k/defconfig~m68k-update-defconfigs-for-2610 arch/m68k/defconfig --- 25/arch/m68k/defconfig~m68k-update-defconfigs-for-2610 2005-01-10 17:29:26.148911680 -0800 +++ 25-akpm/arch/m68k/defconfig 2005-01-10 17:29:26.159910008 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc3-m68k -# Sun Dec 5 14:21:41 2004 +# Linux kernel version: 2.6.10-m68k +# Sun Dec 26 11:23:36 2004 # CONFIG_M68K=y CONFIG_MMU=y @@ -462,6 +462,11 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# # Character devices # CONFIG_AMIGA_BUILTIN_SERIAL=y _