r4276 - dists/trunk/linux-2.6/debian/patches-debian

[Sven Luther]

Author: luther
Date: 2005-09-25 19:19:14 +0000 (Sun, 25 Sep 2005)
New Revision: 4276

Modified:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch
Log:
Part of the vga.h patch was needed at least adding it, but adding a #ifdef CONFIG_APUS just in case to not break m68k/amiga.


Modified: dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch	2005-09-25 18:52:22 UTC (rev 4275)
+++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch	2005-09-25 19:19:14 UTC (rev 4276)
@@ -3017,3 +3017,16 @@
  
  #endif /* __KERNEL__ */
 +#endif /* _PPC_IO_H */
+diff -Nur -x CVS linux-2.6.13/include/video/vga.h linux-2.6.13-apus/include/video/vga.h
+--- linux-2.6.13/include/video/vga.h	2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13-apus/include/video/vga.h	2005-07-30 20:52:54.000000000 +0200
+@@ -28,6 +28,9 @@
+  * Ugh, we don't have PCI space, so map readb() and friends to use Zorro space
+  * for MMIO accesses. This should make cirrusfb work again on Amiga
+  */
++#ifdef CONFIG_APUS
++#include <asm/zorro.h>
++#endif
+ #undef inb_p
+ #undef inw_p
+ #undef outb_p