summaryrefslogtreecommitdiffstats
path: root/common/cmd_portio.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-12-11 11:34:54 +0100
committerStefan Roese <sr@denx.de>2007-12-11 11:34:54 +0100
commit9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch)
tree1afcc9c20c04e19870ab5e2996104877695c54a3 /common/cmd_portio.c
parent7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff)
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff)
downloadtalos-obmc-uboot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.gz
talos-obmc-uboot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.zip
Merge commit 'u-boot/master' into for-1.3.1
Conflicts: drivers/rtc/Makefile
Diffstat (limited to 'common/cmd_portio.c')
-rw-r--r--common/cmd_portio.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index bfe33e3a8c..a06cac0166 100644
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -30,8 +30,6 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_PORTIO)
-
extern int cmd_get_data_size (char *arg, int default_size);
/* Display values from last command.
@@ -165,5 +163,3 @@ U_BOOT_CMD(
"[.b, .w, .l] port\n"
" - read datum from IO port\n"
);
-
-#endif
OpenPOWER on IntegriCloud