[PATCH] four compile fixes for 2.5.12

From: John Kim (john@larvalstage.com)
Date: Wed May 01 2002 - 08:17:07 EST


Pretty boring stuff. Four compile fixes for 2.5.12. It makes trivial
changes to following four files.

drivers/char/rocket_int.h
drivers/char/serial_tx3912.h
fs/udf/ecma_167.h
include/asm-arm/arch-pxa/pxa-regs.h

John Kim

---

diff -Naur linux-2.5.12/drivers/char/rocket_int.h linux-2.5.12-new/drivers/char/rocket_int.h --- linux-2.5.12/drivers/char/rocket_int.h Tue Apr 30 20:08:48 2002 +++ linux-2.5.12-new/drivers/char/rocket_int.h Wed May 1 08:47:17 2002 @@ -185,7 +185,7 @@

/* 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 -Naur linux-2.5.12/drivers/char/serial_tx3912.h linux-2.5.12-new/drivers/char/serial_tx3912.h --- linux-2.5.12/drivers/char/serial_tx3912.h Tue Apr 30 20:08:49 2002 +++ linux-2.5.12-new/drivers/char/serial_tx3912.h Wed May 1 08:47:51 2002 @@ -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 -Naur linux-2.5.12/fs/udf/ecma_167.h linux-2.5.12-new/fs/udf/ecma_167.h --- linux-2.5.12/fs/udf/ecma_167.h Tue Apr 30 20:08:55 2002 +++ linux-2.5.12-new/fs/udf/ecma_167.h Wed May 1 08:48:20 2002 @@ -606,7 +606,7 @@ #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 -Naur linux-2.5.12/include/asm-arm/arch-pxa/pxa-regs.h linux-2.5.12-new/include/asm-arm/arch-pxa/pxa-regs.h --- linux-2.5.12/include/asm-arm/arch-pxa/pxa-regs.h Tue Apr 30 20:08:59 2002 +++ linux-2.5.12-new/include/asm-arm/arch-pxa/pxa-regs.h Wed May 1 08:48:54 2002 @@ -361,7 +361,7 @@ #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 */

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue May 07 2002 - 22:00:11 EST