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/ip28_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/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 |