diff options
| author | Ingo Molnar | 2008-07-22 09:06:21 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-22 09:06:21 +0200 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-x86/apic.h | |
| parent | x86, lguest: fix apic_ops build on UP (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.xz kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-x86/apic.h')
| -rw-r--r-- | include/asm-x86/apic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index 300b65e57240..51339910fdc0 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h @@ -14,8 +14,6 @@ #define ARCH_APICTIMER_STOPS_ON_C3 1 -#define Dprintk printk - /* * Debugging macros */ |