diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /arch/arm/configs/omap3_pandora_defconfig | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/arm/configs/omap3_pandora_defconfig')
| -rw-r--r-- | arch/arm/configs/omap3_pandora_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/omap3_pandora_defconfig b/arch/arm/configs/omap3_pandora_defconfig index 09543f4de5bc..b54ad2e2da36 100644 --- a/arch/arm/configs/omap3_pandora_defconfig +++ b/arch/arm/configs/omap3_pandora_defconfig | |||
| @@ -713,8 +713,8 @@ CONFIG_I2C_OMAP=y | |||
| 713 | # Miscellaneous I2C Chip support | 713 | # Miscellaneous I2C Chip support |
| 714 | # | 714 | # |
| 715 | # CONFIG_DS1682 is not set | 715 | # CONFIG_DS1682 is not set |
| 716 | # CONFIG_AT24 is not set | 716 | # CONFIG_EEPROM_AT24 is not set |
| 717 | # CONFIG_SENSORS_EEPROM is not set | 717 | # CONFIG_EEPROM_LEGACY is not set |
| 718 | # CONFIG_SENSORS_PCF8574 is not set | 718 | # CONFIG_SENSORS_PCF8574 is not set |
| 719 | # CONFIG_PCF8575 is not set | 719 | # CONFIG_PCF8575 is not set |
| 720 | # CONFIG_SENSORS_PCA9539 is not set | 720 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -740,7 +740,7 @@ CONFIG_SPI_OMAP24XX=y | |||
| 740 | # | 740 | # |
| 741 | # SPI Protocol Masters | 741 | # SPI Protocol Masters |
| 742 | # | 742 | # |
| 743 | # CONFIG_SPI_AT25 is not set | 743 | # CONFIG_EEPROM_AT25 is not set |
| 744 | # CONFIG_SPI_SPIDEV is not set | 744 | # CONFIG_SPI_SPIDEV is not set |
| 745 | # CONFIG_SPI_TLE62X0 is not set | 745 | # CONFIG_SPI_TLE62X0 is not set |
| 746 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 746 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |