diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /arch/mips/configs/ip27_defconfig | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
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 |