diff options
| author | Kyle McMartin | 2007-02-17 06:18:23 +0100 |
|---|---|---|
| committer | Kyle McMartin | 2007-02-17 06:18:23 +0100 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /drivers/char/agp | |
| parent | Linux 2.6.20 (diff) | |
| parent | [PATCH] use __u64 rather than u64 in parisc statfs structs (diff) | |
| download | kernel-qcow2-linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.gz kernel-qcow2-linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.xz kernel-qcow2-linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.zip | |
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts:
arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
Diffstat (limited to 'drivers/char/agp')
| -rw-r--r-- | drivers/char/agp/parisc-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c index 17c50b0f83f0..30cc7aeae9ab 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c @@ -235,7 +235,7 @@ static int __init agp_ioc_init(void __iomem *ioc_regs) { struct _parisc_agp_info *info = &parisc_agp_info; - u64 *iova_base, *io_pdir, io_tlb_ps; + u64 iova_base, *io_pdir, io_tlb_ps; int io_tlb_shift; printk(KERN_INFO DRVPFX "IO PDIR shared with sba_iommu\n"); |