diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/mips/configs/ip27_defconfig | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/mips/configs/ip27_defconfig')
| -rw-r--r-- | arch/mips/configs/ip27_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 831d3e5a1ea6..34ea319be94c 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
| @@ -701,7 +701,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 701 | # CONFIG_WATCHDOG is not set | 701 | # CONFIG_WATCHDOG is not set |
| 702 | CONFIG_HW_RANDOM=m | 702 | CONFIG_HW_RANDOM=m |
| 703 | # CONFIG_RTC is not set | 703 | # CONFIG_RTC is not set |
| 704 | CONFIG_SGI_IP27_RTC=y | ||
| 705 | # CONFIG_R3964 is not set | 704 | # CONFIG_R3964 is not set |
| 706 | # CONFIG_APPLICOM is not set | 705 | # CONFIG_APPLICOM is not set |
| 707 | # CONFIG_DRM is not set | 706 | # CONFIG_DRM is not set |