diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-23 10:29:06 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-23 10:29:06 +0000 |
| commit | ff2e381fd7fb8db0c13382ecf968bb6cb100e88a (patch) | |
| tree | 240178210ae87b5987ec4250ec511316678fb6bc /meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch | |
| parent | 6543b12207ff258e65429665198677e2130351c8 (diff) | |
| download | poky-ff2e381fd7fb8db0c13382ecf968bb6cb100e88a.tar.gz | |
xserver-kdrive: added 1.4.99.901 (1.5-rc) from OE
- moved common (1.3.0.0/1.4.99.901) patches to xserver-kdrive
TODO: merge xmodmap and "-mouse tslib" from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4317 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch new file mode 100644 index 0000000000..bd8842721b --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | --- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000 | ||
| 2 | +++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000 | ||
| 3 | @@ -342,7 +342,7 @@ | ||
| 4 | /* | ||
| 5 | * Open the APM driver | ||
| 6 | */ | ||
| 7 | - LinuxApmFd = open ("/dev/apm_bios", 2); | ||
| 8 | + /*LinuxApmFd = open ("/dev/apm_bios", 2); | ||
| 9 | if (LinuxApmFd < 0 && errno == ENOENT) | ||
| 10 | LinuxApmFd = open ("/dev/misc/apm_bios", 2); | ||
| 11 | if (LinuxApmFd >= 0) | ||
| 12 | @@ -352,7 +352,7 @@ | ||
| 13 | RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0); | ||
| 14 | AddEnabledDevice (LinuxApmFd); | ||
| 15 | } | ||
| 16 | - | ||
| 17 | + */ | ||
| 18 | /* | ||
| 19 | * now get the VT | ||
| 20 | */ | ||