diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
| commit | cbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch) | |
| tree | f7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/xserver/xserver-kdrive | |
| parent | 562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff) | |
| download | openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2 openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip | |
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/xserver/xserver-kdrive')
| -rw-r--r-- | openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch b/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch new file mode 100644 index 000000000..35ccadaa8 --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch @@ -0,0 +1,13 @@ +--- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700 ++++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700 +@@ -927,8 +927,10 @@ char *kdefaultMouse[] = { + "/dev/psaux", + "/dev/input/mice", + "/dev/adbmouse", ++#ifdef BREAK_MY_SERIAL_CONSOLE + "/dev/ttyS0", + "/dev/ttyS1", ++#endif + }; + + #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0])) |