projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
char
/
agp
/
parisc-agp.c
diff --git
a/drivers/char/agp/parisc-agp.c
b/drivers/char/agp/parisc-agp.c
index 36d07e3635c6a7d246663c6e44295c0bc931b038..3c8f3d63362570637c39235d3890b95d8ab48dd2 100644
(file)
--- a/
drivers/char/agp/parisc-agp.c
+++ b/
drivers/char/agp/parisc-agp.c
@@
-236,7
+236,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");