diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /include/asm-avr32/io.h | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/asm-avr32/io.h')
| -rw-r--r-- | include/asm-avr32/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h index d030c262a..06e52b137 100644 --- a/include/asm-avr32/io.h +++ b/include/asm-avr32/io.h @@ -22,6 +22,8 @@ #ifndef __ASM_AVR32_IO_H #define __ASM_AVR32_IO_H +#include <asm/types.h> + #ifdef __KERNEL__ /* |