diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 14:53:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 14:53:48 -0400 |
| commit | 7cc47662197b3050a974a6c6aed52291bb38ded0 (patch) | |
| tree | dd95d15aa97a3357d3789eba6848f0f888411bec /drivers/char | |
| parent | 55a6fbf8fc57d7b60d5028663f534475c4965215 (diff) | |
| parent | 27f70c3117194f98beb009dc48bb2aa267f505bf (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Convert ia64 to use int-ll64.h
[IA64] Fix build error in paravirt_patchlist.c
[IA64] ia64 does not need umount2() syscall
[IA64] hook up new rt_tgsigqueueinfo syscall
[IA64] msi_ia64.c dmar_msi_type should be static
[IA64] remove obsolete hw_interrupt_type
[IA64] remove obsolete irq_desc_t typedef
[IA64] remove obsolete no_irq_type
[IA64] unexport fpswa.h
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 183ac3fe44fb..9c7e2343c399 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c | |||
| @@ -518,8 +518,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret) | |||
| 518 | if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) | 518 | if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) |
| 519 | return AE_OK; | 519 | return AE_OK; |
| 520 | 520 | ||
| 521 | printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n", | 521 | printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset " |
| 522 | (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); | 522 | "(ioc=%llx, lba=%llx)\n", (char *)context, |
| 523 | sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); | ||
| 523 | 524 | ||
| 524 | hp_zx1_gart_found = 1; | 525 | hp_zx1_gart_found = 1; |
| 525 | return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */ | 526 | return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */ |