diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /drivers/char | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| parent | cb6efb39163bfb6bb6475fa7c8a5e08e44dbf14a (diff) | |
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')
| -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 | |||
| 235 | agp_ioc_init(void __iomem *ioc_regs) | 235 | agp_ioc_init(void __iomem *ioc_regs) |
| 236 | { | 236 | { |
| 237 | struct _parisc_agp_info *info = &parisc_agp_info; | 237 | struct _parisc_agp_info *info = &parisc_agp_info; |
| 238 | u64 *iova_base, *io_pdir, io_tlb_ps; | 238 | u64 iova_base, *io_pdir, io_tlb_ps; |
| 239 | int io_tlb_shift; | 239 | int io_tlb_shift; |
| 240 | 240 | ||
| 241 | printk(KERN_INFO DRVPFX "IO PDIR shared with sba_iommu\n"); | 241 | printk(KERN_INFO DRVPFX "IO PDIR shared with sba_iommu\n"); |