diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /include/asm-generic/Kbuild.asm | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/asm-generic/Kbuild.asm')
| -rw-r--r-- | include/asm-generic/Kbuild.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 1870d5e05f1..70d185534b9 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm | |||
| @@ -31,6 +31,7 @@ unifdef-y += socket.h | |||
| 31 | unifdef-y += sockios.h | 31 | unifdef-y += sockios.h |
| 32 | unifdef-y += stat.h | 32 | unifdef-y += stat.h |
| 33 | unifdef-y += statfs.h | 33 | unifdef-y += statfs.h |
| 34 | unifdef-y += swab.h | ||
| 34 | unifdef-y += termbits.h | 35 | unifdef-y += termbits.h |
| 35 | unifdef-y += termios.h | 36 | unifdef-y += termios.h |
| 36 | unifdef-y += types.h | 37 | unifdef-y += types.h |