summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/spitz_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-01 15:53:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-01 15:53:33 -0800
commitca98f825ea05edb41346f12408caa30be8a287c6 (patch)
tree98826d67758b0bd028a04e16446441adb66f4d66 /arch/arm/configs/spitz_defconfig
parentb67c26e4fcfdade157d5bd54085720e71518cccd (diff)
parent11849fe67430ba48547e17b25a7831da29863efa (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/configs/spitz_defconfig')
-rw-r--r--arch/arm/configs/spitz_defconfig19
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig
index 18e9beaec46..9895539533d 100644
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
@@ -897,7 +897,24 @@ CONFIG_UNIX98_PTYS=y
#
# I2C support
#
-# CONFIG_I2C is not set
+CONFIG_I2C=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_PXA=y
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
#
# Hardware Monitoring support