git-fixes.diff 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
  2. From: Adam Jackson <ajax@redhat.com>
  3. Date: Wed, 15 Aug 2012 17:03:11 +0000
  4. Subject: Don't bother to include vbe.h
  5. Just copied from xf86 boilerplate afaict.
  6. Signed-off-by: Adam Jackson <ajax@redhat.com>
  7. ---
  8. diff --git a/src/i128_driver.c b/src/i128_driver.c
  9. index 66fdee0..a0f08c0 100644
  10. --- a/src/i128_driver.c
  11. +++ b/src/i128_driver.c
  12. @@ -55,7 +55,6 @@
  13. #include "micmap.h"
  14. #include "xf86DDC.h"
  15. -#include "vbe.h"
  16. #include "xf86cmap.h"
  17. #include "fb.h"
  18. --
  19. cgit v0.9.0.2-2-gbebe
  20. From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
  21. From: Adam Jackson <ajax@redhat.com>
  22. Date: Tue, 25 Sep 2012 12:54:40 +0000
  23. Subject: Remove mibstore.h
  24. Signed-off-by: Adam Jackson <ajax@redhat.com>
  25. ---
  26. diff --git a/src/i128_driver.c b/src/i128_driver.c
  27. index a0f08c0..51a4135 100644
  28. --- a/src/i128_driver.c
  29. +++ b/src/i128_driver.c
  30. @@ -50,8 +50,6 @@
  31. /* All drivers initialising the SW cursor need this */
  32. #include "mipointer.h"
  33. -/* All drivers implementing backing store need this */
  34. -#include "mibstore.h"
  35. #include "micmap.h"
  36. #include "xf86DDC.h"
  37. @@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
  38. return FALSE;
  39. }
  40. - miInitializeBackingStore(pScreen);
  41. xf86SetBackingStore(pScreen);
  42. xf86SetSilkenMouse(pScreen);
  43. --
  44. cgit v0.9.0.2-2-gbebe