diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/pci/hotplug/rpaphp.h | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/pci/hotplug/rpaphp.h')
| -rw-r--r-- | drivers/pci/hotplug/rpaphp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h index 7d5921b1ee78..419919a87b0f 100644 --- a/drivers/pci/hotplug/rpaphp.h +++ b/drivers/pci/hotplug/rpaphp.h | |||
| @@ -46,10 +46,10 @@ | |||
| 46 | #define PRESENT 1 /* Card in slot */ | 46 | #define PRESENT 1 /* Card in slot */ |
| 47 | 47 | ||
| 48 | #define MY_NAME "rpaphp" | 48 | #define MY_NAME "rpaphp" |
| 49 | extern int debug; | 49 | extern int rpaphp_debug; |
| 50 | #define dbg(format, arg...) \ | 50 | #define dbg(format, arg...) \ |
| 51 | do { \ | 51 | do { \ |
| 52 | if (debug) \ | 52 | if (rpaphp_debug) \ |
| 53 | printk(KERN_DEBUG "%s: " format, \ | 53 | printk(KERN_DEBUG "%s: " format, \ |
| 54 | MY_NAME , ## arg); \ | 54 | MY_NAME , ## arg); \ |
| 55 | } while (0) | 55 | } while (0) |