Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Enable FDT/FIT support
microblaze: Remove address offset for uart16550
microblaze: Do not select NFS for platforms without ethernet
microblaze: Clean up reset asm code
microblaze: Save and restore first unused vector
microblaze: Setup MB vectors if feature is enable for u-boot
microblaze: Remove debug saving value
diff --git a/common/usb.c b/common/usb.c
index a5f9e9f..a401c09 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -63,7 +63,7 @@
#ifdef USB_DEBUG
#define USB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-static inline void USB_PRINTF(const char *fmt, ...) {}
+#define USB_PRINTF(fmt, args...)
#endif
#define USB_BUFSIZ 512
@@ -970,7 +970,7 @@
#ifdef USB_HUB_DEBUG
#define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-static inline void USB_HUB_PRINTF(const char *fmt, ...) {}
+#define USB_HUB_PRINTF(fmt, args...)
#endif
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 5c56918..16667f3 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -63,7 +63,7 @@
#ifdef USB_STOR_DEBUG
#define USB_STOR_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-static inline void USB_STOR_PRINTF(const char *fmt, ...) {}
+#define USB_STOR_PRINTF(fmt, args...)
#endif
#include <scsi.h>
diff --git a/include/common.h b/include/common.h
index aeb2d84..d244bd4 100644
--- a/include/common.h
+++ b/include/common.h
@@ -120,8 +120,8 @@
#define debug(fmt,args...) printf (fmt ,##args)
#define debugX(level,fmt,args...) if (DEBUG>=level) printf(fmt,##args);
#else
-static inline void debug(const char *fmt, ...) {}
-static inline void debugX(int level, const char *fmt, ...) {}
+#define debug(fmt,args...)
+#define debugX(level,fmt,args...)
#endif /* DEBUG */
#ifdef DEBUG
diff --git a/include/i2c.h b/include/i2c.h
index 323150d..8ceb4c8 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -55,10 +55,7 @@
#else
#define CONFIG_SYS_MAX_I2C_BUS 1
#define I2C_GET_BUS() 0
-static inline int I2C_SET_BUS(unsigned int bus)
-{
- return 0;
-}
+#define I2C_SET_BUS(a)
#endif
/* define the I2C bus number for RTC and DTT if not already done */