diff options
author | Richard Purdie <richard@openedhand.com> | 2006-04-12 16:19:14 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-04-12 16:19:14 +0000 |
commit | a23e7eef388d31ddd902c801bf63e768d51d9de7 (patch) | |
tree | 38612ade81a85165dc852efdbc11c426160ac9e4 /openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch | |
parent | be7c4cebaa8a373af3a2c3465421576ea3f4d9d5 (diff) | |
download | openembedded-core-a23e7eef388d31ddd902c801bf63e768d51d9de7.tar.gz openembedded-core-a23e7eef388d31ddd902c801bf63e768d51d9de7.tar.bz2 openembedded-core-a23e7eef388d31ddd902c801bf63e768d51d9de7.tar.xz openembedded-core-a23e7eef388d31ddd902c801bf63e768d51d9de7.zip |
linux-openzaurus: Remove 2.6.15 and sync 2.6.16 with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@347 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch')
-rw-r--r-- | openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch b/openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch deleted file mode 100644 index b3a7f786e..000000000 --- a/openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: linux-2.6.14/drivers/serial/8250.c -=================================================================== ---- linux-2.6.14.orig/drivers/serial/8250.c 2005-11-07 18:10:50.000000000 +0000 -+++ linux-2.6.14/drivers/serial/8250.c 2005-11-07 19:01:21.000000000 +0000 -@@ -2333,7 +2333,12 @@ - .devfs_name = "tts/", - .dev_name = "ttyS", - .major = TTY_MAJOR, -+#ifdef CONFIG_SERIAL_PXA -+ .minor = 64 + 3, -+ .name_base = 3, -+#else - .minor = 64, -+#endif - .nr = UART_NR, - .cons = SERIAL8250_CONSOLE, - }; -Index: linux-2.6.14/drivers/serial/serial_core.c -=================================================================== ---- linux-2.6.14.orig/drivers/serial/serial_core.c 2005-11-07 18:10:50.000000000 +0000 -+++ linux-2.6.14/drivers/serial/serial_core.c 2005-11-07 19:01:21.000000000 +0000 -@@ -2126,6 +2126,7 @@ - normal->driver_name = drv->driver_name; - normal->devfs_name = drv->devfs_name; - normal->name = drv->dev_name; -+ normal->name_base = drv->name_base; - normal->major = drv->major; - normal->minor_start = drv->minor; - normal->type = TTY_DRIVER_TYPE_SERIAL; -Index: linux-2.6.14/include/linux/serial_core.h -=================================================================== ---- linux-2.6.14.orig/include/linux/serial_core.h 2005-11-07 18:10:56.000000000 +0000 -+++ linux-2.6.14/include/linux/serial_core.h 2005-11-07 19:01:21.000000000 +0000 -@@ -322,6 +322,7 @@ - const char *driver_name; - const char *dev_name; - const char *devfs_name; -+ int name_base; - int major; - int minor; - int nr; -Index: linux-2.6.14/drivers/serial/serial_cs.c -=================================================================== ---- linux-2.6.14.orig/drivers/serial/serial_cs.c 2005-10-28 01:02:08.000000000 +0100 -+++ linux-2.6.14/drivers/serial/serial_cs.c 2005-11-07 19:01:21.000000000 +0000 -@@ -294,7 +294,7 @@ - kio_addr_t iobase, int irq) - { - struct uart_port port; -- int line; -+ int line, linestart; - - memset(&port, 0, sizeof (struct uart_port)); - port.iobase = iobase; -@@ -311,10 +311,16 @@ - return -EINVAL; - } - -+#if CONFIG_SERIAL_PXA -+ linestart = 3; -+#else -+ linestart = 0; -+#endif -+ - info->line[info->ndev] = line; -- sprintf(info->node[info->ndev].dev_name, "ttyS%d", line); -+ sprintf(info->node[info->ndev].dev_name, "ttyS%d", line+linestart); - info->node[info->ndev].major = TTY_MAJOR; -- info->node[info->ndev].minor = 0x40 + line; -+ info->node[info->ndev].minor = 0x40 + line + linestart; - if (info->ndev > 0) - info->node[info->ndev - 1].next = &info->node[info->ndev]; - info->ndev++; |