projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge by hand (fix up qla_os.c merge error)
[powerpc.git]
/
arch
/
m68k
/
configs
/
atari_defconfig
diff --git
a/arch/m68k/configs/atari_defconfig
b/arch/m68k/configs/atari_defconfig
index
617aa73
..
6433da2
100644
(file)
--- a/
arch/m68k/configs/atari_defconfig
+++ b/
arch/m68k/configs/atari_defconfig
@@
-1,7
+1,7
@@
#
# Automatically generated make config: don't edit
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc
2
-m68k
-# Tue
Apr 5 14:06:18
2005
+# Linux kernel version: 2.6.12-rc
6
-m68k
+# Tue
Jun 7 20:34:32
2005
#
CONFIG_M68K=y
CONFIG_MMU=y
#
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_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
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@
-531,7
+533,6
@@
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
#
# Character devices
#
# Character devices