diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-29 23:45:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-29 23:45:21 -0800 |
| commit | 3a32b2c3d22aaad1d2fef666a88e1d75704d512b (patch) | |
| tree | 8bb1b384d134b1a31fb31ae8268cf2f705b05258 | |
| parent | 815867b8a94c8a8a70896475df922034e8ae6753 (diff) | |
| parent | 3f014b4b5c13175d7228c3252e451f4634ccffa9 (diff) | |
| download | history-3a32b2c3d22aaad1d2fef666a88e1d75704d512b.tar.gz | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 4 | ||||
| -rw-r--r-- | arch/arm/mach-footbridge/cats-hw.c | 1 | ||||
| -rw-r--r-- | drivers/serial/imx.c | 7 | ||||
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-gpio.h | 7 |
4 files changed, 16 insertions, 3 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index b885d32d1ca3b..a39c6a42d68ad 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -160,3 +160,7 @@ SECTIONS .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } } + +/* those must never be empty */ +ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") +ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index f94d176c3201d..d1ced86c379c4 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c @@ -8,6 +8,7 @@ #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/tty.h> #include <asm/hardware/dec21285.h> #include <asm/io.h> diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index fc2a8f03218e9..d273134f9e6cc 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -22,6 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * [29-Mar-2005] Mike Lee + * Added hardware handshake */ #include <linux/config.h> @@ -428,6 +430,11 @@ imx_set_termios(struct uart_port *port, struct termios *termios, else ucr2 = UCR2_SRST | UCR2_IRTS; + if (termios->c_cflag & CRTSCTS) { + ucr2 &= ~UCR2_IRTS; + ucr2 |= UCR2_CTSC; + } + if (termios->c_cflag & CSTOPB) ucr2 |= UCR2_STPB; if (termios->c_cflag & PARENB) { diff --git a/include/asm-arm/arch-s3c2410/regs-gpio.h b/include/asm-arm/arch-s3c2410/regs-gpio.h index 8ca8c0c922f53..2053cbacffc3d 100644 --- a/include/asm-arm/arch-s3c2410/regs-gpio.h +++ b/include/asm-arm/arch-s3c2410/regs-gpio.h @@ -19,6 +19,7 @@ * 18-11-2004 BJD Fixed definitions of GPE3, GPE4, GPE5 and GPE6 * 18-11-2004 BJD Added S3C2440 AC97 controls * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA + * 28-Mar-2005 LCVR Fixed definition of GPB10 */ @@ -212,9 +213,9 @@ #define S3C2410_GPB9_nXDACK0 (0x02 << 18) #define S3C2410_GPB10 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 10) -#define S3C2410_GPB10_INP (0x00 << 18) -#define S3C2410_GPB10_OUTP (0x01 << 18) -#define S3C2410_GPB10_nXDRE0 (0x02 << 18) +#define S3C2410_GPB10_INP (0x00 << 20) +#define S3C2410_GPB10_OUTP (0x01 << 20) +#define S3C2410_GPB10_nXDRE0 (0x02 << 20) /* Port C consits of 16 GPIO/Special function * |