summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
commit61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch)
tree2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/arm/Kconfig
parent9585da3729e7e27bf22818625c10ac6c64ebb609 (diff)
parent2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff)
Merge branch 'master'
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 15dc1a0dffb..32ba00bd0a2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -78,7 +78,7 @@ menu "System Type"
choice
prompt "ARM system type"
- default ARCH_RPC
+ default ARCH_VERSATILE
config ARCH_CLPS7500
bool "Cirrus-CL-PS7500FE"
@@ -799,6 +799,8 @@ source "drivers/i2c/Kconfig"
source "drivers/spi/Kconfig"
+source "drivers/w1/Kconfig"
+
source "drivers/hwmon/Kconfig"
#source "drivers/l3/Kconfig"