Merge branch 'omap/cleanup-prcm-part2' into next/dt

[can-eth-gw-linux.git] / arch / arm / mach-omap2 / i2c.c

diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c
index 4e63097e3cd8b708104f68123be1e633856ee2e9..fbb9b152cd5e7d555e12c71de3c31c469f0617b2 100644 (file)
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@ -20,10 +20,11 @@
  */
 
 #include "soc.h"
-#include "common.h"
 #include "omap_hwmod.h"
 #include "omap_device.h"
 
+#include "prm.h"
+#include "common.h"
 #include "mux.h"
 #include "i2c.h"
 
@@ -32,9 +33,6 @@
 #define OMAP2_I2C_CON_OFFSET                   0x24
 #define OMAP4_I2C_CON_OFFSET                   0xA4
 
-/* Maximum microseconds to wait for OMAP module to softreset */
-#define MAX_MODULE_SOFTRESET_WAIT      10000
-
 #define MAX_OMAP_I2C_HWMOD_NAME_LEN    16
 
 static void __init omap2_i2c_mux_pins(int bus_id)