From cb1e0aee313ce2a2626ca412264b4cc7e688a150 Mon Sep 17 00:00:00 2001
From: Domen Puncer <domen.puncer@ultra.si>
Date: Sun, 13 Aug 2006 23:37:13 +0200
Subject: [PATCH] --- yaml --- r: 36097 b: refs/heads/master c:
 a294de4e97a7a0cdeb949a3b2fbd4d81addc6d8c h: refs/heads/master i:   36095:
 f12adeebc6aad58f98de2e5a45668d82e536b80e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/i2c/busses/Kconfig      | 6 +++---
 trunk/drivers/i2c/busses/i2c-au1550.c | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7f821829e512..2585a4baf0ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ed07134792655db12fddaafbf870425331a21f6
+refs/heads/master: a294de4e97a7a0cdeb949a3b2fbd4d81addc6d8c
diff --git a/trunk/drivers/i2c/busses/Kconfig b/trunk/drivers/i2c/busses/Kconfig
index 884320e70403..404508ca7326 100644
--- a/trunk/drivers/i2c/busses/Kconfig
+++ b/trunk/drivers/i2c/busses/Kconfig
@@ -75,11 +75,11 @@ config I2C_AMD8111
 	  will be called i2c-amd8111.
 
 config I2C_AU1550
-	tristate "Au1550 SMBus interface"
-	depends on I2C && SOC_AU1550
+	tristate "Au1550/Au1200 SMBus interface"
+	depends on I2C && (SOC_AU1550 || SOC_AU1200)
 	help
 	  If you say yes to this option, support will be included for the
-	  Au1550 SMBus interface.
+	  Au1550 and Au1200 SMBus interface.
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-au1550.
diff --git a/trunk/drivers/i2c/busses/i2c-au1550.c b/trunk/drivers/i2c/busses/i2c-au1550.c
index 7140eb00587a..7a005ddfb11e 100644
--- a/trunk/drivers/i2c/busses/i2c-au1550.c
+++ b/trunk/drivers/i2c/busses/i2c-au1550.c
@@ -34,8 +34,7 @@
 #include <linux/errno.h>
 #include <linux/i2c.h>
 
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-pb1x00/pb1550.h>
+#include <asm/mach-au1x00/au1xxx.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
 
 #include "i2c-au1550.h"