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-m68k/openprom.h | |
| parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-m68k/openprom.h')
| -rw-r--r-- | include/asm-m68k/openprom.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h index 869ab9176e9f..d33cdadf78e1 100644 --- a/include/asm-m68k/openprom.h +++ b/include/asm-m68k/openprom.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: openprom.h,v 1.19 1996/09/25 03:51:08 davem Exp $ */ | ||
| 2 | #ifndef __SPARC_OPENPROM_H | 1 | #ifndef __SPARC_OPENPROM_H |
| 3 | #define __SPARC_OPENPROM_H | 2 | #define __SPARC_OPENPROM_H |
| 4 | 3 | ||