Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / isp1301_omap.c

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 5fb27cb0f9d2f632e9b80e143fa7047d275d262a..a128c97e89cb5ec5aa1db1393ec3bca11250bcc6 100644 (file)
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -93,7 +93,7 @@ struct isp1301 {
 
 #if    defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE)
 
-#include <asm/arch/tps65010.h>
+#include <linux/i2c/tps65010.h>
 
 #else
 
@@ -258,12 +258,6 @@ static inline const char *state_name(struct isp1301 *isp)
        return state_string(isp->otg.state);
 }
 
-#ifdef VERBOSE
-#define        dev_vdbg                        dev_dbg
-#else
-#define        dev_vdbg(dev, fmt, arg...)      do{}while(0)
-#endif
-
 /*-------------------------------------------------------------------------*/
 
 /* NOTE:  some of this ISP1301 setup is specific to H2 boards;