diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
tree | ea1a183343573c2a48248923b96d316c0956727c /board/evb64260/local.h | |
parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
download | u-boot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/evb64260/local.h')
-rw-r--r-- | board/evb64260/local.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/evb64260/local.h b/board/evb64260/local.h index 3d9b443..8a3f4b2 100644 --- a/board/evb64260/local.h +++ b/board/evb64260/local.h @@ -26,7 +26,7 @@ /* #define CONFIG_BOOTCOMMAND */ /* #define CONFIG_RAMBOOTCOMMAND */ /* #define CONFIG_NFSBOOTCOMMAND */ -/* #define CFG_AUTOLOAD */ +/* #define CONFIG_SYS_AUTOLOAD */ /* #define CONFIG_PREBOOT */ /* These don't */ |