Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index efc8da498ce711f41d2346b4a5a9acf9c051098d..2cc215ab0103fe1853ba7d48ae22150cc86df4a2 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -720,6 +720,9 @@
 /* Interval between registers                                               */
 #define CFG_ATA_STRIDE         4
 
+/* Support ATAPI devices */
+#define CONFIG_ATAPI            1
+
 /*-----------------------------------------------------------------------
  * Open firmware flat tree support
  *-----------------------------------------------------------------------