Hi,
This patch by Andreas Jochens <[EMAIL PROTECTED]>, fixes a build failure
on amd64 due to types clashing by including 'dfb_types.h' instead
of 'asm/types.h' (needs to be applied after the fbdev one, or just
ignore the error from the missing file).
regards,
guillem
--- gfxdrivers/cyber5k/cyber5k.h 2003-12-05 06:01:06.000000000 +0200
+++ gfxdrivers/cyber5k/cyber5k.h 2006-01-21 21:26:37.000000000 +0200
@@ -28,7 +28,7 @@
#ifndef ___CYBER5K_H__
#define ___CYBER5K_H__
-#include <asm/types.h>
+#include <dfb_types.h>
#include <core/layers.h>
/* HACK */
--- gfxdrivers/cyber5k/mmio.h 2003-12-05 06:01:06.000000000 +0200
+++ gfxdrivers/cyber5k/mmio.h 2006-01-21 21:26:37.000000000 +0200
@@ -28,7 +28,7 @@
#ifndef __CYBER5K_MMIO__
#define __CYBER5K_MMIO__
-#include <asm/types.h>
+#include <dfb_types.h>
#include "cyber5k.h"
#include "regs.h"
--- gfxdrivers/i810/i810.c 2005-08-03 12:21:42.000000000 +0300
+++ gfxdrivers/i810/i810.c 2006-01-21 21:26:37.000000000 +0200
@@ -21,7 +21,7 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#include <asm/types.h>
+#include <dfb_types.h>
#include <stdio.h>
#include <unistd.h>
--- gfxdrivers/i810/i810.h 2005-05-11 12:39:04.000000000 +0300
+++ gfxdrivers/i810/i810.h 2006-01-21 21:26:37.000000000 +0200
@@ -38,7 +38,7 @@
#ifndef __I810_H__
#define __I810_H__
-#include <asm/types.h>
+#include <dfb_types.h>
#include <sys/io.h>
#include <linux/agpgart.h>
--- gfxdrivers/i830/i830.c 2005-08-03 12:21:42.000000000 +0300
+++ gfxdrivers/i830/i830.c 2006-01-21 21:26:37.000000000 +0200
@@ -23,7 +23,7 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#include <asm/types.h>
+#include "i830.h"
#include <stdio.h>
#include <unistd.h>
@@ -58,7 +58,6 @@
DFB_GRAPHICS_DRIVER( i830 )
-#include "i830.h"
/**************************************************************************************************/
--- gfxdrivers/i830/i830.h 2006-01-21 21:26:31.000000000 +0200
+++ gfxdrivers/i830/i830.h 2006-01-21 21:26:37.000000000 +0200
@@ -27,8 +27,8 @@
#ifndef __I830_H__
#define __I830_H__
-#include <asm/types.h>
#include <linux/agpgart.h>
+#include <dfb_types.h>
#include <core/gfxcard.h>
#include <core/layers.h>
--- gfxdrivers/i830/i830_overlay.c 2005-06-02 14:00:49.000000000 +0300
+++ gfxdrivers/i830/i830_overlay.c 2006-01-21 21:26:37.000000000 +0200
@@ -43,6 +43,8 @@
* Matt Sottek <[EMAIL PROTECTED]>
*/
+#include "i830.h"
+
#include <math.h>
#include <string.h>
@@ -60,8 +62,6 @@
#include <gfx/convert.h>
-#include "i830.h"
-
#define I830_OVERLAY_SUPPORTED_OPTIONS (DLOP_DST_COLORKEY)
--- gfxdrivers/nsc/nsc.c 2005-02-07 14:34:20.000000000 +0200
+++ gfxdrivers/nsc/nsc.c 2006-01-21 21:26:37.000000000 +0200
@@ -136,7 +136,7 @@
*
* END_NSC_LIC_GPL */
-#include <asm/types.h>
+#include <dfb_types.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
--- gfxdrivers/sis315/sis315_mmio.h 2003-11-20 12:38:37.000000000 +0200
+++ gfxdrivers/sis315/sis315_mmio.h 2006-01-21 21:26:37.000000000 +0200
@@ -1,7 +1,7 @@
#ifndef _SIS315_MMIO_H
#define _SIS315_MMIO_H
-#include <asm/types.h>
+#include <dfb_types.h>
extern __inline__ __u32 sis_rl(volatile __u8 *mmio, unsigned int offset);
extern __inline__ void sis_wl(volatile __u8 *mmio, unsigned int offset, __u32
value);
--- systems/fbdev/fb.h 2006-01-21 21:26:34.000000000 +0200
+++ systems/fbdev/fb.h 2006-01-21 21:26:37.000000000 +0200
@@ -1,7 +1,7 @@
#ifndef _LINUX_FB_H
#define _LINUX_FB_H
-#include <asm/types.h>
+#include <dfb_types.h>
/* Definitions of frame buffers
*/
_______________________________________________
directfb-dev mailing list
[email protected]
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
