Merge branches 'pxa' and 'orion-fixes1'

[karo-tx-linux.git] / drivers / net / wireless / rt2x00 / rt2400pci.h

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h
index da178d44660ea0f07c8614180a428e595047a715..a5210f9a3360ba521f7ca6dc786351156f32dc18 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2400pci.h
+++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -899,13 +899,13 @@
  * Word2
  */
 #define RXD_W2_BUFFER_LENGTH           FIELD32(0x0000ffff)
-#define RXD_W2_SIGNAL                  FIELD32(0x00ff0000)
-#define RXD_W2_RSSI                    FIELD32(0xff000000)
+#define RXD_W2_BBR0                    FIELD32(0x00ff0000)
+#define RXD_W2_SIGNAL                  FIELD32(0xff000000)
 
 /*
  * Word3
  */
-#define RXD_W3_BBR2                    FIELD32(0x000000ff)
+#define RXD_W3_RSSI                    FIELD32(0x000000ff)
 #define RXD_W3_BBR3                    FIELD32(0x0000ff00)
 #define RXD_W3_BBR4                    FIELD32(0x00ff0000)
 #define RXD_W3_BBR5                    FIELD32(0xff000000)