Fix merge problems

[platform/kernel/u-boot.git] / include / asm-avr32 / io.h

diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h
index ba14674..06e52b1 100644 (file)
--- 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__
 
 /*
@@ -101,8 +103,6 @@ static inline void sync(void)
  * This implementation works for memory below 512MiB (flash, etc.) as
  * well as above 3.5GiB (internal peripherals.)
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (1 << 7)
 #define MAP_WRBACK     (MAP_WRCOMBINE | (1 << 9))