diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /arch/mips/configs/e55_defconfig | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/configs/e55_defconfig')
| -rw-r--r-- | arch/mips/configs/e55_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 78f5004fb721..5467d750b6eb 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
| @@ -32,12 +32,9 @@ CONFIG_ZONE_DMA=y | |||
| 32 | # CONFIG_WR_PPMC is not set | 32 | # CONFIG_WR_PPMC is not set |
| 33 | # CONFIG_MIPS_SIM is not set | 33 | # CONFIG_MIPS_SIM is not set |
| 34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set |
| 35 | # CONFIG_MOMENCO_OCELOT is not set | ||
| 36 | # CONFIG_MOMENCO_OCELOT_G is not set | ||
| 37 | # CONFIG_MIPS_XXS1500 is not set | 35 | # CONFIG_MIPS_XXS1500 is not set |
| 38 | # CONFIG_PNX8550_JBS is not set | 36 | # CONFIG_PNX8550_JBS is not set |
| 39 | # CONFIG_PNX8550_STB810 is not set | 37 | # CONFIG_PNX8550_STB810 is not set |
| 40 | # CONFIG_DDB5477 is not set | ||
| 41 | CONFIG_MACH_VR41XX=y | 38 | CONFIG_MACH_VR41XX=y |
| 42 | # CONFIG_PMC_YOSEMITE is not set | 39 | # CONFIG_PMC_YOSEMITE is not set |
| 43 | # CONFIG_QEMU is not set | 40 | # CONFIG_QEMU is not set |