diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
| commit | bb2c018b09b681d43f5e08124b83e362647ea82b (patch) | |
| tree | d794902c78f9fdd04ed88a4b8d451ed6f9292ec0 /arch/mips/configs/db1550_defconfig | |
| parent | 82638844d9a8581bbf33201cc209a14876eca167 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
drivers/acpi/processor_throttling.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/configs/db1550_defconfig')
| -rw-r--r-- | arch/mips/configs/db1550_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 0c2c70d21db9..e4e324422cd9 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig | |||
| @@ -27,9 +27,7 @@ CONFIG_MIPS_DB1550=y | |||
| 27 | # CONFIG_MIPS_COBALT is not set | 27 | # CONFIG_MIPS_COBALT is not set |
| 28 | # CONFIG_MACH_DECSTATION is not set | 28 | # CONFIG_MACH_DECSTATION is not set |
| 29 | # CONFIG_MACH_JAZZ is not set | 29 | # CONFIG_MACH_JAZZ is not set |
| 30 | # CONFIG_MIPS_ATLAS is not set | ||
| 31 | # CONFIG_MIPS_MALTA is not set | 30 | # CONFIG_MIPS_MALTA is not set |
| 32 | # CONFIG_MIPS_SEAD is not set | ||
| 33 | # CONFIG_WR_PPMC is not set | 31 | # CONFIG_WR_PPMC is not set |
| 34 | # CONFIG_MIPS_SIM is not set | 32 | # CONFIG_MIPS_SIM is not set |
| 35 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 33 | # CONFIG_MOMENCO_JAGUAR_ATX is not set |