diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:34:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:34:09 -0700 |
| commit | 1ee5332cf67c2f5f468ad1a59033d57453bcad1a (patch) | |
| tree | 8d2fd58e6c2f62f74be6be26b3d1ff991c554f79 /drivers/char | |
| parent | 07868201070d87484bd00610a4921e879be78746 (diff) | |
| parent | cae5a39f34d52c46ca49edfc3f297656a0fd60b7 (diff) | |
| download | linux-3.10-1ee5332cf67c2f5f468ad1a59033d57453bcad1a.tar.gz linux-3.10-1ee5332cf67c2f5f468ad1a59033d57453bcad1a.tar.bz2 linux-3.10-1ee5332cf67c2f5f468ad1a59033d57453bcad1a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-2.6:
parisc: hppb.c - fix printk format strings
parisc: parisc-agp.c - use correct page_mask function
parisc: sticore.c - check return values
parisc: dino.c - check return value of pci_assign_resource()
parisc: hp_sdc_mlc.c - check return value of down_trylock()
parisc: includecheck fix for ccio-dma.c
parisc: Set correct bit in protection flags
parisc: isa-eeprom - Fix loff_t usage
parisc: fixed faulty check in lba_pci
parisc: Fix read buffer overflow in pdc_stable driver
parisc: Fix GOT overflow during module load on 64bit kernel
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 f4bb43fb801..e077701ae3d 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c @@ -225,7 +225,7 @@ static const struct agp_bridge_driver parisc_agp_driver = { .configure = parisc_agp_configure, .fetch_size = parisc_agp_fetch_size, .tlb_flush = parisc_agp_tlbflush, - .mask_memory = parisc_agp_mask_memory, + .mask_memory = parisc_agp_page_mask_memory, .masks = parisc_agp_masks, .agp_enable = parisc_agp_enable, .cache_flush = global_cache_flush, |