diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /drivers/pci/hotplug/rpaphp.h | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
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) |