diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /arch/tile/include/asm/stat.h | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'arch/tile/include/asm/stat.h')
| -rw-r--r-- | arch/tile/include/asm/stat.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/tile/include/asm/stat.h b/arch/tile/include/asm/stat.h index 3dc90fa92c70..b16e5db8f0e7 100644 --- a/arch/tile/include/asm/stat.h +++ b/arch/tile/include/asm/stat.h | |||
| @@ -1 +1,4 @@ | |||
| 1 | #ifdef CONFIG_COMPAT | ||
| 2 | #define __ARCH_WANT_STAT64 /* Used for compat_sys_stat64() etc. */ | ||
| 3 | #endif | ||
| 1 | #include <asm-generic/stat.h> | 4 | #include <asm-generic/stat.h> |