Merge remote-tracking branch 'u-boot-imx/master'

[karo-tx-uboot.git] / include / ata.h

diff --git a/include/ata.h b/include/ata.h
index b51475da814e99b0e40f9ecc6d01c4a6ec0fe2c2..3b2d737e6176cacdef08122fdf7006ac844f8a65 100644 (file)
--- a/include/ata.h
+++ b/include/ata.h
@@ -82,7 +82,9 @@
 /*
  * Device / Head Register Bits
  */
+#ifndef ATA_DEVICE
 #define ATA_DEVICE(x)  ((x & 1)<<4)
+#endif /* ATA_DEVICE */
 #define ATA_LBA                0xE0
 
 /*