diff options
author | Domen Puncer <domen.puncer@ultra.si> | 2006-08-13 17:37:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-26 18:38:50 -0400 |
commit | a294de4e97a7a0cdeb949a3b2fbd4d81addc6d8c (patch) | |
tree | 89befb2c35261a7f44227d34d9509402005897b6 | |
parent | 6ed07134792655db12fddaafbf870425331a21f6 (diff) |
i2c-au1550: Add I2C support for Au1200
i2c-au1550: Add I2C support for Au1200
Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/i2c/busses/Kconfig | 6 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-au1550.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 884320e70403..404508ca7326 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -75,11 +75,11 @@ config I2C_AMD8111 | |||
75 | will be called i2c-amd8111. | 75 | will be called i2c-amd8111. |
76 | 76 | ||
77 | config I2C_AU1550 | 77 | config I2C_AU1550 |
78 | tristate "Au1550 SMBus interface" | 78 | tristate "Au1550/Au1200 SMBus interface" |
79 | depends on I2C && SOC_AU1550 | 79 | depends on I2C && (SOC_AU1550 || SOC_AU1200) |
80 | help | 80 | help |
81 | If you say yes to this option, support will be included for the | 81 | If you say yes to this option, support will be included for the |
82 | Au1550 SMBus interface. | 82 | Au1550 and Au1200 SMBus interface. |
83 | 83 | ||
84 | This driver can also be built as a module. If so, the module | 84 | This driver can also be built as a module. If so, the module |
85 | will be called i2c-au1550. | 85 | will be called i2c-au1550. |
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 7140eb00587a..7a005ddfb11e 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c | |||
@@ -34,8 +34,7 @@ | |||
34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
35 | #include <linux/i2c.h> | 35 | #include <linux/i2c.h> |
36 | 36 | ||
37 | #include <asm/mach-au1x00/au1000.h> | 37 | #include <asm/mach-au1x00/au1xxx.h> |
38 | #include <asm/mach-pb1x00/pb1550.h> | ||
39 | #include <asm/mach-au1x00/au1xxx_psc.h> | 38 | #include <asm/mach-au1x00/au1xxx_psc.h> |
40 | 39 | ||
41 | #include "i2c-au1550.h" | 40 | #include "i2c-au1550.h" |