diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/m68k/configs/bvme6000_defconfig | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/m68k/configs/bvme6000_defconfig')
| -rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index b501db51d9ec..da2a23a21463 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.12-rc2-m68k | 3 | # Linux kernel version: 2.6.12-rc6-m68k |
| 4 | # Tue Apr 5 14:06:19 2005 | 4 | # Tue Jun 7 20:34:37 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -35,6 +35,8 @@ CONFIG_KOBJECT_UEVENT=y | |||
| 35 | CONFIG_KALLSYMS=y | 35 | CONFIG_KALLSYMS=y |
| 36 | # CONFIG_KALLSYMS_ALL is not set | 36 | # CONFIG_KALLSYMS_ALL is not set |
| 37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 38 | CONFIG_PRINTK=y | ||
| 39 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | 40 | CONFIG_BASE_FULL=y |
| 39 | CONFIG_FUTEX=y | 41 | CONFIG_FUTEX=y |
| 40 | CONFIG_EPOLL=y | 42 | CONFIG_EPOLL=y |
| @@ -496,7 +498,6 @@ CONFIG_SERIO_SERPORT=m | |||
| 496 | CONFIG_SERIO_LIBPS2=m | 498 | CONFIG_SERIO_LIBPS2=m |
| 497 | # CONFIG_SERIO_RAW is not set | 499 | # CONFIG_SERIO_RAW is not set |
| 498 | # CONFIG_GAMEPORT is not set | 500 | # CONFIG_GAMEPORT is not set |
| 499 | CONFIG_SOUND_GAMEPORT=y | ||
| 500 | 501 | ||
| 501 | # | 502 | # |
| 502 | # Character devices | 503 | # Character devices |