diff options
| author | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-11-13 20:32:26 -0600 |
|---|---|---|
| committer | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-11-13 20:32:26 -0600 |
| commit | a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf (patch) | |
| tree | 29351ae423e57d20f3c54623667b1a5d4ea7c8e3 /hw/kdrive/mga | |
| parent | 6facd958c2e7098cb68eac2810a88b8cd40f19c0 (diff) | |
| parent | f80a8ae6e6820378ea70ac0849cee8bf3055e0e8 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Diffstat (limited to 'hw/kdrive/mga')
| -rw-r--r-- | hw/kdrive/mga/Makefile.am | 11 | ||||
| -rw-r--r-- | hw/kdrive/mga/mgastub.c | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am index d8ebae920..ee0798915 100644 --- a/hw/kdrive/mga/Makefile.am +++ b/hw/kdrive/mga/Makefile.am @@ -7,10 +7,6 @@ bin_PROGRAMS = Xmga noinst_LIBRARIES = libmga.a -if TSLIB -TSLIB_FLAG = -lts -endif - libmga_a_SOURCES = \ mgadraw.c \ g400_composite.c \ @@ -29,9 +25,4 @@ MGA_LIBS = \ Xmga_LDADD = \ $(MGA_LIBS) \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ - $(TSLIB_FLAG) - -Xmga_DEPENDENCIES = \ - libmga.a \ - $(top_builddir)/hw/kdrive/vesa/libvesa.a + @XSERVER_LIBS@ diff --git a/hw/kdrive/mga/mgastub.c b/hw/kdrive/mga/mgastub.c index ebb40fd19..5afbf7fcc 100644 --- a/hw/kdrive/mga/mgastub.c +++ b/hw/kdrive/mga/mgastub.c @@ -45,7 +45,8 @@ InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv) void InitInput (int argc, char **argv) { - KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); + KdOsAddInputDrivers (); + KdInitInput (); } void |