diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /arch/mips/configs/ip28_defconfig | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
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 | |||
| 70 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 70 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 71 | CONFIG_IRQ_CPU=y | 71 | CONFIG_IRQ_CPU=y |
| 72 | CONFIG_SWAP_IO_SPACE=y | 72 | CONFIG_SWAP_IO_SPACE=y |
| 73 | CONFIG_SGI_HAS_DS1286=y | ||
| 74 | CONFIG_SGI_HAS_INDYDOG=y | 73 | CONFIG_SGI_HAS_INDYDOG=y |
| 75 | CONFIG_SGI_HAS_SEEQ=y | 74 | CONFIG_SGI_HAS_SEEQ=y |
| 76 | CONFIG_SGI_HAS_WD93=y | 75 | CONFIG_SGI_HAS_WD93=y |
| @@ -585,7 +584,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 585 | # CONFIG_IPMI_HANDLER is not set | 584 | # CONFIG_IPMI_HANDLER is not set |
| 586 | # CONFIG_HW_RANDOM is not set | 585 | # CONFIG_HW_RANDOM is not set |
| 587 | # CONFIG_RTC is not set | 586 | # CONFIG_RTC is not set |
| 588 | CONFIG_SGI_DS1286=y | ||
| 589 | # CONFIG_DTLK is not set | 587 | # CONFIG_DTLK is not set |
| 590 | # CONFIG_R3964 is not set | 588 | # CONFIG_R3964 is not set |
| 591 | # CONFIG_RAW_DRIVER is not set | 589 | # CONFIG_RAW_DRIVER is not set |