Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev

diff --cc Makefile
index 326c33cc44142d061188d586eb28f48aae63814d,1f63b8bc44f43be672f0d0dfa60f8129629d0824..a731ee8979c79dc042aba2f19ad9c8df77383a7d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2310,11 -2301,8 +2310,11 @@@ xtract_omap1610xxx = $(subst _cs0boot,,
  
  xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
  
 +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