diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-08-05 02:16:57 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-08-05 02:16:57 +0200 |
| commit | b7f315842830d67081642248a3757c713b6b6684 (patch) | |
| tree | 8606d4227532dccbd0accfa79321cd437fbe3922 /drivers/char/agp/parisc-agp.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | agp: kill phys_to_gart() and gart_to_phys() (diff) | |
| download | linux-b7f315842830d67081642248a3757c713b6b6684.tar.xz linux-b7f315842830d67081642248a3757c713b6b6684.zip | |
Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next
Diffstat (limited to 'drivers/char/agp/parisc-agp.c')
| -rw-r--r-- | drivers/char/agp/parisc-agp.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c index e077701ae3d9..60ab75104da9 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c @@ -32,7 +32,7 @@ #define AGP8X_MODE (1 << AGP8X_MODE_BIT) static unsigned long -parisc_agp_mask_memory(struct agp_bridge_data *bridge, unsigned long addr, +parisc_agp_mask_memory(struct agp_bridge_data *bridge, dma_addr_t addr, int type); static struct _parisc_agp_info { @@ -189,20 +189,12 @@ parisc_agp_remove_memory(struct agp_memory *mem, off_t pg_start, int type) } static unsigned long -parisc_agp_mask_memory(struct agp_bridge_data *bridge, unsigned long addr, +parisc_agp_mask_memory(struct agp_bridge_data *bridge, dma_addr_t addr, int type) { return SBA_PDIR_VALID_BIT | addr; } -static unsigned long -parisc_agp_page_mask_memory(struct agp_bridge_data *bridge, struct page *page, - int type) -{ - unsigned long addr = phys_to_gart(page_to_phys(page)); - return SBA_PDIR_VALID_BIT | addr; -} - static void parisc_agp_enable(struct agp_bridge_data *bridge, u32 mode) { |