commit 6d0f6bcf337c5261c08fabe12982178c2c489d76
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Thu Oct 16 15:01:15 2008 +0200
committer Wolfgang Denk <wd@denx.de> Sat Oct 18 21:54:03 2008 +0200
tree ae13958ffa9c6b58c2ea97aac07a4ad2f04a350f
parent 71edc271816ec82cf0550dd6980be2da3cc2ad9e

rename CFG_ macros to CONFIG_SYS

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

common/devices.c

diff --git a/common/devices.c b/common/devices.c
index 7d0ac2e..ce3b7a0 100644
--- a/common/devices.c
+++ b/common/devices.c
@@ -40,12 +40,12 @@
 device_t *stdio_devices[] = { NULL, NULL, NULL };
 char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
 
-#if defined(CONFIG_SPLASH_SCREEN) && !defined(CFG_DEVICE_NULLDEV)
-#define	CFG_DEVICE_NULLDEV	1
+#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
+#define	CONFIG_SYS_DEVICE_NULLDEV	1
 #endif
 
 
-#ifdef CFG_DEVICE_NULLDEV
+#ifdef CONFIG_SYS_DEVICE_NULLDEV
 void nulldev_putc(const char c)
 {
 	/* nulldev is empty! */
@@ -90,7 +90,7 @@
 
 	device_register (&dev);
 
-#ifdef CFG_DEVICE_NULLDEV
+#ifdef CONFIG_SYS_DEVICE_NULLDEV
 	memset (&dev, 0, sizeof (dev));
 
 	strcpy (dev.name, "nulldev");
@@ -162,7 +162,7 @@
 /* deregister the device "devname".
  * returns 0 if success, -1 if device is assigned and 1 if devname not found
  */
-#ifdef	CFG_DEVICE_DEREGISTER
+#ifdef	CONFIG_SYS_DEVICE_DEREGISTER
 int device_deregister(char *devname)
 {
 	int l;
@@ -197,7 +197,7 @@
 	}
 	return 0;
 }
-#endif	/* CFG_DEVICE_DEREGISTER */
+#endif	/* CONFIG_SYS_DEVICE_DEREGISTER */
 
 int devices_init (void)
 {
@@ -216,7 +216,7 @@
 	INIT_LIST_HEAD(&(devs.list));
 
 #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
-	i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+	i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 #endif
 #ifdef CONFIG_LCD
 	drv_lcd_init ();