diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /arch/avr32/include/uapi/asm/stat.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/avr32/include/uapi/asm/stat.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/stat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/include/uapi/asm/stat.h b/arch/avr32/include/uapi/asm/stat.h index e72881e10230..c06acef7fce7 100644 --- a/arch/avr32/include/uapi/asm/stat.h +++ b/arch/avr32/include/uapi/asm/stat.h | |||
| @@ -5,8 +5,8 @@ | |||
| 5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
| 6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
| 7 | */ | 7 | */ |
| 8 | #ifndef __ASM_AVR32_STAT_H | 8 | #ifndef _UAPI__ASM_AVR32_STAT_H |
| 9 | #define __ASM_AVR32_STAT_H | 9 | #define _UAPI__ASM_AVR32_STAT_H |
| 10 | 10 | ||
| 11 | struct __old_kernel_stat { | 11 | struct __old_kernel_stat { |
| 12 | unsigned short st_dev; | 12 | unsigned short st_dev; |
| @@ -76,4 +76,4 @@ struct stat64 { | |||
| 76 | unsigned long __unused2; | 76 | unsigned long __unused2; |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | #endif /* __ASM_AVR32_STAT_H */ | 79 | #endif /* _UAPI__ASM_AVR32_STAT_H */ |