summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-01-03 21:07:04 +0100
committerWolfgang Denk <wd@denx.de>2010-01-03 21:07:04 +0100
commit6ca9da4d42aeb43df5ef29f7d0518009df583b2f (patch)
treefc4d12f8989a8f5cb3130cc4146904b269c15a4f /include
parent87d93a1ba2ae23550e1370adb7a3b00af0831165 (diff)
parentbe34fef7fdcfaffc68495e50929669ac5e4bd800 (diff)
downloadu-boot-imx-6ca9da4d42aeb43df5ef29f7d0518009df583b2f.zip
u-boot-imx-6ca9da4d42aeb43df5ef29f7d0518009df583b2f.tar.gz
u-boot-imx-6ca9da4d42aeb43df5ef29f7d0518009df583b2f.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include')
-rw-r--r--include/configs/alpr.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index 964630f..0fed9ad 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -232,7 +232,6 @@
#include <config_cmd_default.h>
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_DIAG
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_FPGA
#define CONFIG_CMD_I2C
@@ -240,7 +239,6 @@
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NET
#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
#undef CONFIG_CMD_NFS
#undef CONFIG_WATCHDOG /* watchdog disabled */