Merge ../linus

[linux-drm-fsl-dcu.git] / arch / avr32 / lib / delay.c

diff --git a/arch/avr32/lib/delay.c b/arch/avr32/lib/delay.c
index 462c8307b680fa00efd8a98e0010ac5ee991bbd3..b3bc0b56e2c6506849de3ba758aae262f552f477 100644 (file)
--- a/arch/avr32/lib/delay.c
+++ b/arch/avr32/lib/delay.c
@@ -12,9 +12,9 @@
 
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/param.h>
 #include <linux/types.h>
 
-#include <asm/delay.h>
 #include <asm/processor.h>
 #include <asm/sysreg.h>