From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Wed, 6 Aug 2008 14:05:38 +0200
Subject: Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
---
 include/ppc4xx.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/ppc4xx.h')

diff --git a/include/ppc4xx.h b/include/ppc4xx.h
index 5a6b855916..c71da60844 100644
--- a/include/ppc4xx.h
+++ b/include/ppc4xx.h
@@ -47,6 +47,12 @@
 #endif
 
 #if defined(CONFIG_440)
+/*
+ * Enable long long (%ll ...) printf format on 440 PPC's since most of
+ * them support 36bit physical addressing
+ */
+#define CFG_64BIT_VSPRINTF
+#define CFG_64BIT_STRTOUL
 #include <ppc440.h>
 #else
 #include <ppc405.h>
-- 
cgit v1.2.1