From 83cc651bcde188859b7434be40630e72d4c59bc3 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 17 Oct 2008 15:08:14 +0100
Subject: [PATCH] --- yaml --- r: 116817 b: refs/heads/master c:
 3be8c477d7f03c75dbd7911aa93cc6afa57fd168 h: refs/heads/master i:   116815:
 88a1c22cb3285f0ffe3b727d1d2a0a6d2a6b1a16 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/configs/trizeps4_defconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e90c229a5c56..4dd8a604349f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11cd4cb5f55cdc2f487b8c714610aa3538e28103
+refs/heads/master: 3be8c477d7f03c75dbd7911aa93cc6afa57fd168
diff --git a/trunk/arch/arm/configs/trizeps4_defconfig b/trunk/arch/arm/configs/trizeps4_defconfig
index 8b7a431a8bfc..9033d147f052 100644
--- a/trunk/arch/arm/configs/trizeps4_defconfig
+++ b/trunk/arch/arm/configs/trizeps4_defconfig
@@ -147,6 +147,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
+CONFIG_TRIZEPS_PXA=y
 CONFIG_MACH_TRIZEPS4=y
 CONFIG_MACH_TRIZEPS4_CONXS=y
 # CONFIG_MACH_TRIZEPS4_ANY is not set