diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 11:28:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 11:28:35 -0700 |
commit | 057a056ced1ee7e000bad2a5c88241502747d350 (patch) | |
tree | b996aa3dfb515bef95ebe4594dd2c7b46f01db2e /arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h | |
parent | Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | cris: return of class_create should be considered (diff) | |
download | linux-dev-057a056ced1ee7e000bad2a5c88241502747d350.tar.xz linux-dev-057a056ced1ee7e000bad2a5c88241502747d350.zip |
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS updates from Jesper Nilsson.
* tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
cris: return of class_create should be considered
CRIS: defconfig: remove MTDRAM_ABS_POS
CRIS v32: remove some double unlocks
Fix typos
cris: migrate exception table users off module.h and onto extable.h
cris: v10: axisflashmap: remove unused ifdefs
cris: use generic io.h
cris: fix Kconfig mismatch when building with CONFIG_PCI
cris: cardbus: fix header include path
cris: add dev88_defconfig
cris: irq: stop loop from accessing array out of bounds
cris: fasttimer: fix mixed declarations and code compile warning
cris: intmem: fix pointer comparison compile warning
cris: intmem: fix device_initcall compile warning
Diffstat (limited to 'arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h')
-rw-r--r-- | arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h b/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h index 5517f04153a4..c4b6b0e9b1da 100644 --- a/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h +++ b/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h @@ -61,7 +61,7 @@ #define IO_WIDTH(reg, field) IO_WIDTH_ (reg##_, field##_) #define IO_WIDTH_(reg_, field_) (reg_##_##field_##_WIDTH) -/*--- Obsolete. Kept for backw compatibility. ---*/ +/*--- Obsolete. Kept for backward compatibility. ---*/ /* Reads (or writes) a byte/uword/udword from the specified mode register. */ #define IO_RD(reg) (*(volatile u32*)(reg)) |