Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / hwmon / omap34xx_temp.c

diff --git a/drivers/hwmon/omap34xx_temp.c b/drivers/hwmon/omap34xx_temp.c
index bcb3c9ae15364b2c0d07d962bbf07e91a695daa6..18e07643165fef430b7631ad053a9011b44efb5f 100644 (file)
--- a/drivers/hwmon/omap34xx_temp.c
+++ b/drivers/hwmon/omap34xx_temp.c
@@ -29,8 +29,8 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <asm/arch/omap34xx.h>
-#include <asm/arch/control.h>
+#include <mach/omap34xx.h>
+#include <mach/control.h>
 
 #define TEMP_SENSOR_SOC BIT(8)
 #define TEMP_SENSOR_EOCZ BIT(7)