diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/mips/configs/decstation_defconfig | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/mips/configs/decstation_defconfig')
| -rw-r--r-- | arch/mips/configs/decstation_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 58c2cd68c3a7..9e65e6a2dcb3 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
| @@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y | |||
| 26 | # CONFIG_MIPS_COBALT is not set | 26 | # CONFIG_MIPS_COBALT is not set |
| 27 | CONFIG_MACH_DECSTATION=y | 27 | CONFIG_MACH_DECSTATION=y |
| 28 | # CONFIG_MACH_JAZZ is not set | 28 | # CONFIG_MACH_JAZZ is not set |
| 29 | # CONFIG_MIPS_ATLAS is not set | ||
| 30 | # CONFIG_MIPS_MALTA is not set | 29 | # CONFIG_MIPS_MALTA is not set |
| 31 | # CONFIG_MIPS_SEAD is not set | ||
| 32 | # CONFIG_WR_PPMC is not set | 30 | # CONFIG_WR_PPMC is not set |
| 33 | # CONFIG_MIPS_SIM is not set | 31 | # CONFIG_MIPS_SIM is not set |
| 34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 32 | # CONFIG_MOMENCO_JAGUAR_ATX is not set |