diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2010-01-04 09:48:02 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2010-01-04 09:48:02 +0100 |
| commit | 99fbc2780bf5880035d2c33a6791052d37d327e4 (patch) | |
| tree | a1f54c48aaa8965ff3e04790731556db6e66f075 /include | |
| parent | 45601ae9232a68fa976fce0f71b5b4d511cc3548 (diff) | |
| parent | 6ca9da4d42aeb43df5ef29f7d0518009df583b2f (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/alpr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 964630fa5..0fed9ad68 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 */ |