commit adfbe06a3dcf791c1ec2fea6dfb2c59f0ad27c88
author Andrew Victor <linux@maxim.org.za> Wed Apr 02 22:36:58 2008 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu Apr 10 14:57:21 2008 +0100
tree c23ea429b88ecf5ccf13a2b59e4a476daf6ee4fc
parent 32b1216d1e338d69cc5a11ca81fc247eb8ddfb2e

[ARM] 4914/1: AT91: Update defconfigs (Part 1)

Update the default configuration for the following AT91-based boards:
   Atmel AT91RM9200 DK
   Atmel AT91RM9200 EK
   Atmel AT91SAM9260 EK
   Atmel AT91SAM9261 EK
   Atmel AT91SAM9263 EK
   Atmel AT91SAM9RL EK

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/configs/at91rm9200dk_defconfig

diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig
index e10d003..2dbbbc3 100644
--- a/arch/arm/configs/at91rm9200dk_defconfig
+++ b/arch/arm/configs/at91rm9200dk_defconfig
@@ -620,14 +620,14 @@
 #
 # I2C Algorithms
 #
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALGOPCA is not set
 
 #
 # I2C Hardware Bus support
 #
-CONFIG_I2C_AT91=y
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set