summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/types.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-12-07 06:43:40 -0700
committerTom Rini <trini@ti.com>2012-12-07 08:47:59 -0700
commitfd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (patch)
treea42d63aae4f7c07f441321c18098a85cbcc45dee /arch/x86/include/asm/types.h
parent13d43555a9154cf12255023c47e80d947d7d0604 (diff)
parentac426b7290e3a96c97fbc093f15cd0660e0edaf2 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/include/asm/types.h')
-rw-r--r--arch/x86/include/asm/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index 9a40e383eb3..e9fde88f7d4 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -45,8 +45,8 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
-typedef unsigned long phys_addr_t;
-typedef unsigned long phys_size_t;
+typedef unsigned long long phys_addr_t;
+typedef unsigned long long phys_size_t;
#endif /* __KERNEL__ */