diff options
author | Ingo Molnar | 2008-08-14 12:19:59 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-08-14 12:19:59 +0200 |
commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/asm-sh/statfs.h | |
parent | X86_SMP: tlb_XX.c declare smp_invalidate_interrupt before they get used (diff) | |
parent | Linux 2.6.27-rc3 (diff) | |
download | kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.tar.gz kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.tar.xz kernel-qcow2-linux-8d7ccaa545490cdffdfaff0842436a8dd85cf47b.zip |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sh/statfs.h')
-rw-r--r-- | include/asm-sh/statfs.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-sh/statfs.h b/include/asm-sh/statfs.h deleted file mode 100644 index 9202a023328f..000000000000 --- a/include/asm-sh/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_SH_STATFS_H -#define __ASM_SH_STATFS_H - -#include <asm-generic/statfs.h> - -#endif /* __ASM_SH_STATFS_H */ |