diff -rc drm-mach64/Makefile.kernel drm-mach64-2.6/Makefile.kernel
*** drm-mach64/Makefile.kernel	Tue Jan 20 14:21:52 2004
--- drm-mach64-2.6/Makefile.kernel	Tue Jan 20 14:22:29 2004
***************
*** 49,55 ****
  obj-$(CONFIG_DRM_FFB)   += ffb.o
  
  ifeq ($(BELOW2552),y)
! include $(TOPDIR)/Rules.make
  endif
  
  ifeq ($(BELOW25),y)
--- 49,55 ----
  obj-$(CONFIG_DRM_FFB)   += ffb.o
  
  ifeq ($(BELOW2552),y)
! include $(TOPDIR)/debian/rules
  endif
  
  ifeq ($(BELOW25),y)
diff -rc drm-mach64/debian/control.m4 drm-mach64-2.6/debian/control.m4
*** drm-mach64/debian/control.m4	Sun May  4 11:35:50 2003
--- drm-mach64-2.6/debian/control.m4	Tue Jan 20 14:05:10 2004
***************
*** 1,3 ****
--- 1,4 ----
+ Source: drm-mach64-module-KVERS
  Section: graphics
  Priority: extra
  Maintainer: KMAINT <KEMAIL>
diff -rc drm-mach64/drmP.h drm-mach64-2.6/drmP.h
*** drm-mach64/drmP.h	Sun May  4 12:28:46 2003
--- drm-mach64-2.6/drmP.h	Tue Jan 20 13:58:13 2004
***************
*** 48,54 ****
  #include <linux/init.h>
  #include <linux/file.h>
  #include <linux/pci.h>
! #include <linux/wrapper.h>
  #include <linux/version.h>
  #include <linux/sched.h>
  #include <linux/smp_lock.h>	/* For (un)lock_kernel */
--- 48,54 ----
  #include <linux/init.h>
  #include <linux/file.h>
  #include <linux/pci.h>
! /* include <linux/wrapper.h> */
  #include <linux/version.h>
  #include <linux/sched.h>
  #include <linux/smp_lock.h>	/* For (un)lock_kernel */
***************
*** 470,475 ****
--- 470,477 ----
  } drm_device_dma_t;
  
  #if __REALLY_HAVE_AGP
+ typedef struct agp_memory agp_memory;
+ 
  typedef struct drm_agp_mem {
  	unsigned long      handle;
  	agp_memory         *memory;
***************
*** 479,484 ****
--- 481,488 ----
  	struct drm_agp_mem *next;
  } drm_agp_mem_t;
  
+ typedef struct agp_kern_info agp_kern_info;
+ 
  typedef struct drm_agp_head {
  	agp_kern_info      agp_info;
  	drm_agp_mem_t      *memory;