diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-x86/apic.h | |
| parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
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 @@ | |||
| 14 | 14 | ||
| 15 | #define ARCH_APICTIMER_STOPS_ON_C3 1 | 15 | #define ARCH_APICTIMER_STOPS_ON_C3 1 |
| 16 | 16 | ||
| 17 | #define Dprintk printk | ||
| 18 | |||
| 19 | /* | 17 | /* |
| 20 | * Debugging macros | 18 | * Debugging macros |
| 21 | */ | 19 | */ |