diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
| commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
| tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /arch/avr32/configs/mimc200_defconfig | |
| parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'arch/avr32/configs/mimc200_defconfig')
| -rw-r--r-- | arch/avr32/configs/mimc200_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig index 981e4f8b8aeb..1a58ffbc752d 100644 --- a/arch/avr32/configs/mimc200_defconfig +++ b/arch/avr32/configs/mimc200_defconfig | |||
| @@ -565,8 +565,8 @@ CONFIG_I2C_GPIO=y | |||
| 565 | # Miscellaneous I2C Chip support | 565 | # Miscellaneous I2C Chip support |
| 566 | # | 566 | # |
| 567 | # CONFIG_DS1682 is not set | 567 | # CONFIG_DS1682 is not set |
| 568 | CONFIG_AT24=y | 568 | CONFIG_EEPROM_AT24=y |
| 569 | # CONFIG_SENSORS_EEPROM is not set | 569 | # CONFIG_EEPROM_LEGACY is not set |
| 570 | # CONFIG_SENSORS_PCF8574 is not set | 570 | # CONFIG_SENSORS_PCF8574 is not set |
| 571 | # CONFIG_PCF8575 is not set | 571 | # CONFIG_PCF8575 is not set |
| 572 | # CONFIG_SENSORS_PCA9539 is not set | 572 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -592,7 +592,7 @@ CONFIG_SPI_ATMEL=y | |||
| 592 | # | 592 | # |
| 593 | # SPI Protocol Masters | 593 | # SPI Protocol Masters |
| 594 | # | 594 | # |
| 595 | CONFIG_SPI_AT25=y | 595 | CONFIG_EEPROM_AT25=y |
| 596 | # CONFIG_SPI_SPIDEV is not set | 596 | # CONFIG_SPI_SPIDEV is not set |
| 597 | # CONFIG_SPI_TLE62X0 is not set | 597 | # CONFIG_SPI_TLE62X0 is not set |
| 598 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 598 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |