Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / w1 / masters / omap_hdq.c

diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 8cb6aa38d647880785de77afedda58fb2df80d55..880e282b75dfa6452cdd71ccd2e65bf6e2db79b3 100644 (file)
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -16,7 +16,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "../w1.h"
 #include "../w1_int.h"