generic-ipi: more merge fallout

[linux-2.6] / drivers / firewire / fw-ohci.h

diff --git a/drivers/firewire/fw-ohci.h b/drivers/firewire/fw-ohci.h
index 5754c6e9d595da7ba283e81c63fd8b25dfa451d5..a2fbb6240ca75033e683edafd56b934856d2613b 100644 (file)
--- a/drivers/firewire/fw-ohci.h
+++ b/drivers/firewire/fw-ohci.h
@@ -125,6 +125,7 @@
 #define OHCI1394_lockRespErr           0x00000200
 #define OHCI1394_selfIDComplete                0x00010000
 #define OHCI1394_busReset              0x00020000
+#define OHCI1394_regAccessFail         0x00040000
 #define OHCI1394_phy                   0x00080000
 #define OHCI1394_cycleSynch            0x00100000
 #define OHCI1394_cycle64Seconds                0x00200000