diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
| commit | 9e42d0cf5020aaf217433cad1a224745241d212a (patch) | |
| tree | 8d64537c600024a4220d1309873ac3467726c3b0 /arch/sparc/kernel/pci_msi.c | |
| parent | 97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (diff) | |
| parent | 18b8e08e290e9df588f51f5a7df50555f5a25664 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Work around branch tracer warning.
sparc64: Fix unsigned long long warnings in drivers.
sparc64: Use unsigned long long for u64.
sparc: refactor code in fault_32.c
sparc64: refactor code in init_64.c
sparc64: refactor code in viohs.c
sparc: make proces_ver_nack a bit more readable
Diffstat (limited to 'arch/sparc/kernel/pci_msi.c')
| -rw-r--r-- | arch/sparc/kernel/pci_msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci_msi.c b/arch/sparc/kernel/pci_msi.c index 4ef282e81912..f1be37a7b123 100644 --- a/arch/sparc/kernel/pci_msi.c +++ b/arch/sparc/kernel/pci_msi.c | |||
| @@ -426,8 +426,8 @@ void sparc64_pbm_msi_init(struct pci_pbm_info *pbm, | |||
| 426 | pbm->name, | 426 | pbm->name, |
| 427 | pbm->msi_first, pbm->msi_num, pbm->msi_data_mask, | 427 | pbm->msi_first, pbm->msi_num, pbm->msi_data_mask, |
| 428 | pbm->msix_data_width); | 428 | pbm->msix_data_width); |
| 429 | printk(KERN_INFO "%s: MSI addr32[0x%lx:0x%x] " | 429 | printk(KERN_INFO "%s: MSI addr32[0x%llx:0x%x] " |
| 430 | "addr64[0x%lx:0x%x]\n", | 430 | "addr64[0x%llx:0x%x]\n", |
| 431 | pbm->name, | 431 | pbm->name, |
| 432 | pbm->msi32_start, pbm->msi32_len, | 432 | pbm->msi32_start, pbm->msi32_len, |
| 433 | pbm->msi64_start, pbm->msi64_len); | 433 | pbm->msi64_start, pbm->msi64_len); |