diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-07-06 10:38:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-06 10:38:28 +0200 |
| commit | dcc0264878406d52b879d2e5a63d3d793371434e (patch) | |
| tree | 3a2d693997fad34fd049a56518dbb44195342392 /include/configs/acadia.h | |
| parent | 6b0a174a1e6f55e1f5a1fbb223cdad7645a4646e (diff) | |
| parent | e4dbe1b215f5c6c462e76909d240bd96472b84de (diff) | |
| download | u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.zip u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.tar.gz u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot-testing
Diffstat (limited to 'include/configs/acadia.h')
| -rw-r--r-- | include/configs/acadia.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/acadia.h b/include/configs/acadia.h index 3f5d025..5bd8ac6 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -299,7 +299,6 @@ #define CONFIG_SUPPORT_VFAT - /* * Command line configuration. */ @@ -331,8 +330,6 @@ #undef CONFIG_CMD_IMLS #endif - - #undef CONFIG_WATCHDOG /* watchdog disabled */ /*----------------------------------------------------------------------- |