diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:49:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:49:34 -0400 |
| commit | d95c3578120e5bc4784069439f00ccb1b5f87717 (patch) | |
| tree | c819de31de3983f3d69f223ede07667ff23bf7da /arch/arm/configs/badge4_defconfig | |
| parent | ba1d755a36f66101aa88ac9ebb54694def6ec38d (diff) | |
| parent | 78b020d035074fc3aa4d017353bb2c32e2aff56f (diff) | |
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'arch/arm/configs/badge4_defconfig')
| -rw-r--r-- | arch/arm/configs/badge4_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig index b2bbf217c707..80222feb7dad 100644 --- a/arch/arm/configs/badge4_defconfig +++ b/arch/arm/configs/badge4_defconfig | |||
| @@ -750,7 +750,7 @@ CONFIG_I2C_ELEKTOR=m | |||
| 750 | # Other I2C Chip support | 750 | # Other I2C Chip support |
| 751 | # | 751 | # |
| 752 | # CONFIG_SENSORS_DS1337 is not set | 752 | # CONFIG_SENSORS_DS1337 is not set |
| 753 | # CONFIG_SENSORS_EEPROM is not set | 753 | # CONFIG_EEPROM_LEGACY is not set |
| 754 | # CONFIG_SENSORS_PCF8574 is not set | 754 | # CONFIG_SENSORS_PCF8574 is not set |
| 755 | # CONFIG_SENSORS_PCF8591 is not set | 755 | # CONFIG_SENSORS_PCF8591 is not set |
| 756 | # CONFIG_SENSORS_RTC8564 is not set | 756 | # CONFIG_SENSORS_RTC8564 is not set |