Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into...

[~andy/linux] / arch / arm / mach-pxa / pxa300.c

diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 40bb16501d8601789875c03bbef88dd87519c925..17cbc0c7bdb8dd6572ff9da306c359cfca2b5e20 100644 (file)
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 #include <mach/pxa300.h>