Merge branch 'master' of git://git.denx.de/u-boot-arm

2013-09-06 20:25:35 -04:00
parent 1affd4d4a3 68e1747f9c
commit 47f75cf2e1
124 changed files with 8727 additions and 454 deletions
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -3,6 +3,14 @@

 #define ndelay(x)	udelay(1)

+#define dev_dbg(dev, fmt, args...)		\
+	debug(fmt, ##args)
+#define dev_vdbg(dev, fmt, args...)		\
+	debug(fmt, ##args)
+#define dev_info(dev, fmt, args...)		\
+	printf(fmt, ##args)
+#define dev_err(dev, fmt, args...)		\
+	printf(fmt, ##args)
 #define printk	printf

 #define KERN_EMERG