diff options
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/chips/Kconfig | 4 | ||||
-rw-r--r-- | drivers/i2c/chips/isp1301_omap.c | 2 | ||||
-rw-r--r-- | drivers/i2c/chips/tps65010.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index fe3008e59467..bd7082c2443d 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig | |||
@@ -88,12 +88,8 @@ config ISP1301_OMAP | |||
88 | This driver can also be built as a module. If so, the module | 88 | This driver can also be built as a module. If so, the module |
89 | will be called isp1301_omap. | 89 | will be called isp1301_omap. |
90 | 90 | ||
91 | # NOTE: This isn't really OMAP-specific, except for the current | ||
92 | # interface location in <include/asm-arm/arch-omap/tps65010.h> | ||
93 | # and having mostly OMAP-specific board support | ||
94 | config TPS65010 | 91 | config TPS65010 |
95 | tristate "TPS6501x Power Management chips" | 92 | tristate "TPS6501x Power Management chips" |
96 | depends on ARCH_OMAP | ||
97 | default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK | 93 | default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK |
98 | help | 94 | help |
99 | If you say yes here you get support for the TPS6501x series of | 95 | If you say yes here you get support for the TPS6501x series of |
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index ebfbb2947ae6..2a3160153f54 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
@@ -100,7 +100,7 @@ struct isp1301 { | |||
100 | 100 | ||
101 | #if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE) | 101 | #if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE) |
102 | 102 | ||
103 | #include <asm/arch/tps65010.h> | 103 | #include <linux/i2c/tps65010.h> |
104 | 104 | ||
105 | #else | 105 | #else |
106 | 106 | ||
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c index e320994b981c..4154a9108859 100644 --- a/drivers/i2c/chips/tps65010.c +++ b/drivers/i2c/chips/tps65010.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
32 | #include <linux/mutex.h> | 32 | #include <linux/mutex.h> |
33 | 33 | ||
34 | #include <asm/arch/tps65010.h> | 34 | #include <linux/i2c/tps65010.h> |
35 | 35 | ||
36 | /*-------------------------------------------------------------------------*/ | 36 | /*-------------------------------------------------------------------------*/ |
37 | 37 | ||