From bc2e0c4b423bc19d7ad5f26ab7adf455f61c7942 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Thu, 10 Apr 2003 01:58:33 +0100 Subject: [PATCH] [AGPGART] ia64 related AGP fixes from David Mosberger. --- drivers/char/agp/generic.c | 1 + drivers/char/agp/hp-agp.c | 4 ++-- drivers/char/agp/i460-agp.c | 2 +- drivers/char/drm/drm_bufs.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 6064b80326046..8c0b404bb31ec 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "agp.h" __u32 *agp_gatt_table; diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 2f5ab9f533edb..ef7ef95cf3975 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c @@ -369,7 +369,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev) } static struct agp_driver hp_agp_driver = { - .owner = THIS_MODULE; + .owner = THIS_MODULE, }; static int __init agp_hp_probe (struct pci_dev *dev, const struct pci_device_id *ent) @@ -394,7 +394,7 @@ static struct pci_device_id agp_hp_pci_table[] __initdata = { { } }; -MODULE_DEVICE_TABLE(pci, agp_pci_table); +MODULE_DEVICE_TABLE(pci, agp_hp_pci_table); static struct __initdata pci_driver agp_hp_pci_driver = { .name = "agpgart-hp", diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index 95f70e68dcb5f..abc3ab63354a0 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c @@ -560,7 +560,7 @@ static int __init intel_i460_setup (struct pci_dev *pdev __attribute__((unused)) } static struct agp_driver i460_agp_driver = { - .owner = THIS_MODULE; + .owner = THIS_MODULE, }; static int __init agp_intel_i460_probe (struct pci_dev *dev, const struct pci_device_id *ent) diff --git a/drivers/char/drm/drm_bufs.h b/drivers/char/drm/drm_bufs.h index 25b48e6cd07c5..313b3622689b6 100644 --- a/drivers/char/drm/drm_bufs.h +++ b/drivers/char/drm/drm_bufs.h @@ -106,7 +106,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp, switch ( map->type ) { case _DRM_REGISTERS: case _DRM_FRAME_BUFFER: -#if !defined(__sparc__) && !defined(__alpha__) +#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) if ( map->offset + map->size < map->offset || map->offset < virt_to_phys(high_memory) ) { DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); -- 2.53.0