Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index b646a48..acbd719 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -69,6 +69,7 @@
 /* defines only for the constants which don't work well as enums */
 #define ATA_TAG_POISON         0xfafbfcfdU
 
+#undef PORT_UNKNOWN
 enum {
        /* various global constants */
        LIBATA_MAX_PRD          = ATA_MAX_PRD / 2,