[ARM] configs: Add tegra w1 master to stingray defconfig

author Andrei Warkentin <andreiw@motorola.com>

Mon, 28 Jun 2010 23:06:30 +0000 (18:06 -0500)

committer Colin Cross <ccross@android.com>

Wed, 6 Oct 2010 23:33:10 +0000 (16:33 -0700)
author Andrei Warkentin <andreiw@motorola.com>
Mon, 28 Jun 2010 23:06:30 +0000 (18:06 -0500)
committer Colin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:33:10 +0000 (16:33 -0700)
diff --git a/arch/arm/configs/stingray_defconfig b/arch/arm/configs/stingray_defconfig

index f1e0fdb8db6f6c1d5e5a3128867399caf92f82bd..c82dc7509cc5df2bb55684b13fa411a5e4ab57c8 100644 (file)
--- a/arch/arm/configs/stingray_defconfig
+++ b/arch/arm/configs/stingray_defconfig
@@ -995,7 +995,8 @@ CONFIG_W1=y
  #
  # 1-wire Bus Masters
  #
-CONFIG_W1_MASTER_DS2482=y
+# CONFIG_W1_MASTER_DS2482 is not set
+CONFIG_W1_MASTER_TEGRA=y
  # CONFIG_W1_MASTER_DS1WM is not set
  # CONFIG_W1_MASTER_GPIO is not set
author	Andrei Warkentin <andreiw@motorola.com>
	Mon, 28 Jun 2010 23:06:30 +0000 (18:06 -0500)
committer	Colin Cross <ccross@android.com>
	Wed, 6 Oct 2010 23:33:10 +0000 (16:33 -0700)