diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /include/mtd/inftl-user.h | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/mtd/inftl-user.h')
| -rw-r--r-- | include/mtd/inftl-user.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mtd/inftl-user.h b/include/mtd/inftl-user.h index e17eda302b2d..d409d489d900 100644 --- a/include/mtd/inftl-user.h +++ b/include/mtd/inftl-user.h | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | #ifndef __MTD_INFTL_USER_H__ | 6 | #ifndef __MTD_INFTL_USER_H__ |
| 7 | #define __MTD_INFTL_USER_H__ | 7 | #define __MTD_INFTL_USER_H__ |
| 8 | 8 | ||
| 9 | #include <linux/types.h> | ||
| 10 | |||
| 9 | #define OSAK_VERSION 0x5120 | 11 | #define OSAK_VERSION 0x5120 |
| 10 | #define PERCENTUSED 98 | 12 | #define PERCENTUSED 98 |
| 11 | 13 | ||