diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2005-01-10 17:13:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-10 17:13:15 -0800 |
commit | c5b9fb87f26f8a7cd1ae64a800ad45637fe827bf (patch) | |
tree | ecfa6dea94ec714cba084e4e9b1227b47f0103f8 /arch | |
parent | 681569acbf2f96e8bcfc7655736b0223feade423 (diff) | |
download | history-c5b9fb87f26f8a7cd1ae64a800ad45637fe827bf.tar.gz |
[PATCH] M68k: Update defconfigs for 2.6.10
M68k: Update defconfigs for 2.6.10
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 9 | ||||
-rw-r--r-- | arch/m68k/defconfig | 9 |
12 files changed, 84 insertions, 24 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 714483fe718247..c1b23336450bcb 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -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 --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 15e0b04c8dcc06..648361b544c0cc 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -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 --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 85e7e376fdb571..1fb25c0b3e95cd 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -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 --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index d6afed3840044e..f1f2cf027100ff 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -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 --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index d9a8765e55298b..53dde43ddfcb5b 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -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 --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 6c3cac1404a1ef..2452dac8db9d02 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -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 --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index c70eabba17c5c4..ea38e87a6051fe 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -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 --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 34d31cc5147bac..f931a64939d6ac 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -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 --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index a83e649fa9ce40..713020cd6f2ed1 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -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 --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index df64a87a415ef8..783d00cbb70720 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -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 --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index d21a7ae0bf7749..c25f91347893e5 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -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 --git a/arch/m68k/defconfig b/arch/m68k/defconfig index 89628d8d9c930d..78f57d3983405d 100644 --- a/arch/m68k/defconfig +++ b/arch/m68k/defconfig @@ -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 |