From b2141f45ac6195d882952abe4888ed513ed5780a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 15 Dec 2006 09:26:20 +0100
Subject: [PATCH] --- yaml --- r: 47146 b: refs/heads/master c:
 ca377fecdd822f9ef5b0a21586040e7d0e1d0c7a h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/input/touchscreen/ucb1400_ts.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e13fda34e28..a4e3036d36f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb7d8f9b7b0a9f51c9869d0da63ea75a2c95caf
+refs/heads/master: ca377fecdd822f9ef5b0a21586040e7d0e1d0c7a
diff --git a/trunk/drivers/input/touchscreen/ucb1400_ts.c b/trunk/drivers/input/touchscreen/ucb1400_ts.c
index 4358a0a78eaa..c7db4032ef02 100644
--- a/trunk/drivers/input/touchscreen/ucb1400_ts.c
+++ b/trunk/drivers/input/touchscreen/ucb1400_ts.c
@@ -83,7 +83,7 @@
 
 
 struct ucb1400 {
-	ac97_t			*ac97;
+	struct snd_ac97		*ac97;
 	struct input_dev	*ts_idev;
 
 	int			irq;