[PATCH] four compile fixes for 2.5.12

Pretty boring stuff.  Four compile fixes for 2.5.12.

diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 74dda61edfa6dfd78c7b5973e93608a5c55b7da5..8e768a0cc4bc69fc42dccfc5e02ca91b34a752fd 100644 (file)
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -185,7 +185,7 @@ Channel Register Offsets - Indexed - Internal - Fixed
 
 /* Old clock prescale definition and baud rates associated with it */
 
-#define CLOCK_PRESC 0x19  */        /* mod 9 (divide by 10) prescale */
+#define CLOCK_PRESC 0x19            /* mod 9 (divide by 10) prescale */
 #define BRD50             4607
 #define BRD75             3071
 #define BRD110            2094

diff --git a/drivers/char/serial_tx3912.h b/drivers/char/serial_tx3912.h
index 8276797e1a5c5040957771df04693c64870d5cb6..3ae0052bf9aecab239a7d071ee881db6c3f4e744 100644 (file)
--- a/drivers/char/serial_tx3912.h
+++ b/drivers/char/serial_tx3912.h
@@ -24,7 +24,7 @@
 #define UART_TXOVERRUN_INT  3  /* transmit overrun error          (25, 15) */
 #define UART_EMPTY_INT      2  /* both trans/recv regs empty      (24, 14) */
 #define UART_DMAFULL_INT    1  /* DMA at end of buffer            (23, 13) */
-#define UART_DMAHALF_INT    0  /* DMA halfway through buffer */   (22, 12) */
+#define UART_DMAHALF_INT    0  /* DMA halfway through buffer      (22, 12) */
 
 #define UARTA_SHIFT        22
 #define UARTB_SHIFT        12

diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
index 6e42f6fd6dc8aa63d68279b1ead4f080d23161b4..9132ff515a18752b826922e64d539a7d3a4bb22f 100644 (file)
--- a/fs/udf/ecma_167.h
+++ b/fs/udf/ecma_167.h
@@ -606,7 +606,7 @@ struct fileEntry
 #define FE_RECORD_FMT_CRLF             0x0A
 #define FE_RECORD_FMT_LFCR             0x0B
 
-#define Record Display Attributes (ECMA 167r3 4/14.9.8) */
+/* Record Display Attributes (ECMA 167r3 4/14.9.8) */
 #define FE_RECORD_DISPLAY_ATTR_UNDEF   0x00
 #define FE_RECORD_DISPLAY_ATTR_1       0x01
 #define FE_RECORD_DISPLAY_ATTR_2       0x02

diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index ad618f0fb63ff502633a2ceb6a4fecb6e4e80b0f..9be1fcdf3f0134edd56477335c5392dedd2b0f31 100644 (file)
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -361,7 +361,7 @@ typedef void            (*ExcpHndlr) (void) ;
 #define LSR_OE         (1 << 1)        /* Overrun Error */
 #define LSR_DR         (1 << 0)        /* Data Ready */
 
-#define MCR_LOOP       (1 << 4)        */
+#define MCR_LOOP       (1 << 4)
 #define MCR_OUT2       (1 << 3)        /* force MSR_DCD in loopback mode */
 #define MCR_OUT1       (1 << 2)        /* force MSR_RI in loopback mode */
 #define MCR_RTS                (1 << 1)        /* Request to Send */