diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 15:02:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 15:02:22 -0800 |
| commit | 8a60ba0a0512c00553c9a20f83f7eabd2662ac0b (patch) | |
| tree | 7e203d6a4dec465cdd58f1b5e75c8f4ad6368578 /arch/avr32/include/uapi/asm/shmbuf.h | |
| parent | af2e2f328052082f58f041d574ed50c7f21c598f (diff) | |
| parent | e7f2c8c1f0e5b062c23001dac229e570228940e8 (diff) | |
| download | linux-8a60ba0a0512c00553c9a20f83f7eabd2662ac0b.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 updates from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: uapi: be sure of "_UAPI" prefix for all guard macros
avr32: add kprobe_ctlblk memory struct
avr32: fix out-of-range jump in large kernels
avr32: setup crt for early panic()
Diffstat (limited to 'arch/avr32/include/uapi/asm/shmbuf.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/shmbuf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/include/uapi/asm/shmbuf.h b/arch/avr32/include/uapi/asm/shmbuf.h index c62fba41739a..b94cf8b60b73 100644 --- a/arch/avr32/include/uapi/asm/shmbuf.h +++ b/arch/avr32/include/uapi/asm/shmbuf.h @@ -1,5 +1,5 @@ -#ifndef __ASM_AVR32_SHMBUF_H -#define __ASM_AVR32_SHMBUF_H +#ifndef _UAPI__ASM_AVR32_SHMBUF_H +#define _UAPI__ASM_AVR32_SHMBUF_H /* * The shmid64_ds structure for i386 architecture. @@ -39,4 +39,4 @@ struct shminfo64 { unsigned long __unused4; }; -#endif /* __ASM_AVR32_SHMBUF_H */ +#endif /* _UAPI__ASM_AVR32_SHMBUF_H */ |