diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 04:17:41 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 04:17:41 +0200 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/powerpc/kernel/msi.c | |
| parent | sh: ap325 and Migo-R use new sh_mobile_ceu_info flags (diff) | |
| parent | serial: fixup /proc/tty/driver/serial after proc_fops conversion (diff) | |
| download | linux-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.xz linux-c4361bb64b81f5b81a7a08d58654493385a2f2b2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/msi.c')
| -rw-r--r-- | arch/powerpc/kernel/msi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c index 3bb7d3dd28be..8bbc12d20f5c 100644 --- a/arch/powerpc/kernel/msi.c +++ b/arch/powerpc/kernel/msi.c @@ -9,6 +9,7 @@ #include <linux/kernel.h> #include <linux/msi.h> +#include <linux/pci.h> #include <asm/machdep.h> @@ -19,6 +20,10 @@ int arch_msi_check_device(struct pci_dev* dev, int nvec, int type) return -ENOSYS; } + /* PowerPC doesn't support multiple MSI yet */ + if (type == PCI_CAP_ID_MSI && nvec > 1) + return 1; + if (ppc_md.msi_check_device) { pr_debug("msi: Using platform check routine.\n"); return ppc_md.msi_check_device(dev, nvec, type); |