git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
arch
/
avr32
/
lib
/
delay.c
diff --git
a/arch/avr32/lib/delay.c
b/arch/avr32/lib/delay.c
index
462c830
..
b3bc0b5
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>