diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2005-06-12 11:25:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-12 20:43:21 -0700 |
| commit | 707f919c643937e43a04e31d0502ecbf5a10445a (patch) | |
| tree | 8f8cd503daad5283750b8174386c5232de920cc4 /arch/m68k/configs/apollo_defconfig | |
| parent | a58e76f25432dc5e3e84d04c27bec03347ca365b (diff) | |
| download | blackbird-op-linux-707f919c643937e43a04e31d0502ecbf5a10445a.tar.gz blackbird-op-linux-707f919c643937e43a04e31d0502ecbf5a10445a.zip | |
[PATCH] M68k: Update defconfigs
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 505a2968e604..63024b0b7ac3 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.12-rc2-m68k -# Tue Apr 5 14:06:00 2005 +# Linux kernel version: 2.6.12-rc6-m68k +# Tue Jun 7 20:34:27 2005 # CONFIG_M68K=y CONFIG_MMU=y @@ -35,6 +35,8 @@ CONFIG_KOBJECT_UEVENT=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -497,7 +499,6 @@ CONFIG_SERIO_SERPORT=m CONFIG_SERIO_LIBPS2=m # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set -CONFIG_SOUND_GAMEPORT=y # # Character devices |
