summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-19 23:12:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-19 23:12:03 -0700
commit26baeba8ddfb23bb295807ebc387c98f47f60fd9 (patch)
tree17bb4da6c15e92a30157752cabe10848a84479e2 /include
parent281dd25cdc0d6903929b79183816d151ea626341 (diff)
parent67c5587ad4047041e4fb137628076388ede05281 (diff)
downloadop-kernel-dev-26baeba8ddfb23bb295807ebc387c98f47f60fd9.zip
op-kernel-dev-26baeba8ddfb23bb295807ebc387c98f47f60fd9.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-pxa/pxa-regs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index 13fa2de..3af7165 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -653,7 +653,7 @@
#define UDCCS_IO_RFS (1 << 0) /* Receive FIFO service */
#define UDCCS_IO_RPC (1 << 1) /* Receive packet complete */
-#define UDCCS_IO_ROF (1 << 3) /* Receive overflow */
+#define UDCCS_IO_ROF (1 << 2) /* Receive overflow */
#define UDCCS_IO_DME (1 << 3) /* DMA enable */
#define UDCCS_IO_RNE (1 << 6) /* Receive FIFO not empty */
#define UDCCS_IO_RSP (1 << 7) /* Receive short packet */
OpenPOWER on IntegriCloud