summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2008-02-15 13:00:22 +0000
committerPeter Pearse <peter.pearse@arm.com>2008-02-15 13:00:22 +0000
commitfaf8f9bc95e526446c3b0554ebdc22af1291e72a (patch)
tree4240c05b3ccc6faaf9158dc34a1322eee0f491c7 /Makefile
parentd7d9afa48cfa5b07089e3694859a377676a81bd1 (diff)
parent65230107025733e89e28fd5e5cfd916d4953c28a (diff)
downloadblackbird-obmc-uboot-faf8f9bc95e526446c3b0554ebdc22af1291e72a.tar.gz
blackbird-obmc-uboot-faf8f9bc95e526446c3b0554ebdc22af1291e72a.zip
Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 326c33cc44..a731ee8979 100644
--- a/Makefile
+++ b/Makefile
@@ -2314,7 +2314,7 @@ at91cap9adk_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9
at91rm9200dk_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
+ @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
cmc_pu2_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
OpenPOWER on IntegriCloud