diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/mips/configs/emma2rh_defconfig | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/mips/configs/emma2rh_defconfig')
| -rw-r--r-- | arch/mips/configs/emma2rh_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig index a484b7d396fc..4c9d0405a5df 100644 --- a/arch/mips/configs/emma2rh_defconfig +++ b/arch/mips/configs/emma2rh_defconfig | |||
| @@ -59,7 +59,7 @@ CONFIG_MARKEINS=y | |||
| 59 | # CONFIG_SIBYTE_LITTLESUR is not set | 59 | # CONFIG_SIBYTE_LITTLESUR is not set |
| 60 | # CONFIG_SIBYTE_CRHINE is not set | 60 | # CONFIG_SIBYTE_CRHINE is not set |
| 61 | # CONFIG_SIBYTE_CRHONE is not set | 61 | # CONFIG_SIBYTE_CRHONE is not set |
| 62 | # CONFIG_SNI_RM200_PCI is not set | 62 | # CONFIG_SNI_RM is not set |
| 63 | # CONFIG_TOSHIBA_JMR3927 is not set | 63 | # CONFIG_TOSHIBA_JMR3927 is not set |
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |