Commit 97c5291a authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents fef3278f 1b0d7f26
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#define SERIAL_S3C2410_NAME "ttySAC" #define SERIAL_S3C2410_NAME "ttySAC"
#define SERIAL_S3C2410_MAJOR 204 #define SERIAL_S3C2410_MAJOR 204
#define SERIAL_S3C2410_MINOR 4 #define SERIAL_S3C2410_MINOR 64
/* we can support 3 uarts, but not always use them */ /* we can support 3 uarts, but not always use them */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment