diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /arch/sh/configs/cayman_defconfig | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'arch/sh/configs/cayman_defconfig')
| -rw-r--r-- | arch/sh/configs/cayman_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig index e21c0e8e22d9..92895013813d 100644 --- a/arch/sh/configs/cayman_defconfig +++ b/arch/sh/configs/cayman_defconfig | |||
| @@ -700,8 +700,8 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 700 | # Miscellaneous I2C Chip support | 700 | # Miscellaneous I2C Chip support |
| 701 | # | 701 | # |
| 702 | # CONFIG_DS1682 is not set | 702 | # CONFIG_DS1682 is not set |
| 703 | # CONFIG_AT24 is not set | 703 | # CONFIG_EEPROM_AT24 is not set |
| 704 | # CONFIG_SENSORS_EEPROM is not set | 704 | # CONFIG_EEPROM_LEGACY is not set |
| 705 | # CONFIG_SENSORS_PCF8574 is not set | 705 | # CONFIG_SENSORS_PCF8574 is not set |
| 706 | # CONFIG_PCF8575 is not set | 706 | # CONFIG_PCF8575 is not set |
| 707 | # CONFIG_SENSORS_PCA9539 is not set | 707 | # CONFIG_SENSORS_PCA9539 is not set |