diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:45:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:45:53 -0400 |
| commit | 0c97f524fc16004602f97ba19c36acdcc0fb9688 (patch) | |
| tree | c413a5d51dec3ddbe5f2e5cb0ea828976538168f /drivers/serial/amba-pl010.c | |
| parent | c71bd6944eb1458b7887af1783101f5a46140c40 (diff) | |
| parent | 4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
[ARM] 3600/1: increase amba-pl010 UART_NR to 8
[ARM] 3571/1: netX: serial driver for Hilscher netX
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 1631414000a2..e920d196d0b1 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | 52 | ||
| 53 | #include <asm/io.h> | 53 | #include <asm/io.h> |
| 54 | 54 | ||
| 55 | #define UART_NR 2 | 55 | #define UART_NR 8 |
| 56 | 56 | ||
| 57 | #define SERIAL_AMBA_MAJOR 204 | 57 | #define SERIAL_AMBA_MAJOR 204 |
| 58 | #define SERIAL_AMBA_MINOR 16 | 58 | #define SERIAL_AMBA_MINOR 16 |