diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
tree | 607b09022b206a539cb4a924e4ef476443798252 /arch/powerpc/kernel/pci-common.c | |
parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index da5a3855a0c4..19b12d2cbb4b 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -16,8 +16,6 @@ | |||
16 | * 2 of the License, or (at your option) any later version. | 16 | * 2 of the License, or (at your option) any later version. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #define DEBUG | ||
20 | |||
21 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
22 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
23 | #include <linux/string.h> | 21 | #include <linux/string.h> |
@@ -258,7 +256,8 @@ int pci_read_irq_line(struct pci_dev *pci_dev) | |||
258 | } else { | 256 | } else { |
259 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", | 257 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", |
260 | oirq.size, oirq.specifier[0], oirq.specifier[1], | 258 | oirq.size, oirq.specifier[0], oirq.specifier[1], |
261 | oirq.controller->full_name); | 259 | oirq.controller ? oirq.controller->full_name : |
260 | "<default>"); | ||
262 | 261 | ||
263 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, | 262 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, |
264 | oirq.size); | 263 | oirq.size); |