Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --combined include/configs/MPC8349EMDS.h
index 9964a07b02099db361c79576b579da9002334f44,bb90c2d0a709afca61fcda27212540930f95cdb4..331f4c93a20354f53fc61d1bbec67b9f0b8e2b1d
--- 1/include/configs/MPC8349EMDS.h
--- 2/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@@ -29,6 -29,8 +29,6 @@@
  #ifndef __CONFIG_H
  #define __CONFIG_H
  
 -#undef DEBUG
 -
  /*
   * High Level Configuration Options
   */
@@@ -354,6 -356,7 +354,7 @@@
  #define CFG_I2C2_OFFSET               0x3100
  
  /* SPI */
+ #define CONFIG_MPC8XXX_SPI
  #define CONFIG_HARD_SPI                       /* SPI with hardware support */
  #undef CONFIG_SOFT_SPI                        /* SPI bit-banged */