diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 00:04:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 00:04:48 +0300 |
| commit | 78f902ccc597d6ce3e8d1477d70f2d79e960ba7a (patch) | |
| tree | c6ceab663de16501d1dda1c1596fe2dacaaef8e3 /arch/mips/configs/ip28_defconfig | |
| parent | 9ee670fd87b7d69c8633b94c42aadcbbcb96f28e (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | linux-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.tar.xz | |
Merge commit 'v2.6.28-rc8' into x86/doc
Diffstat (limited to 'arch/mips/configs/ip28_defconfig')
| -rw-r--r-- | arch/mips/configs/ip28_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig index 822b01f643e3..70a744e9a8c5 100644 --- a/arch/mips/configs/ip28_defconfig +++ b/arch/mips/configs/ip28_defconfig @@ -70,7 +70,6 @@ CONFIG_CPU_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_IRQ_CPU=y CONFIG_SWAP_IO_SPACE=y -CONFIG_SGI_HAS_DS1286=y CONFIG_SGI_HAS_INDYDOG=y CONFIG_SGI_HAS_SEEQ=y CONFIG_SGI_HAS_WD93=y @@ -585,7 +584,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_RTC is not set -CONFIG_SGI_DS1286=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set |