diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
| commit | 329f0a8a35a664fb33f58f10538f5440ee19c54e (patch) | |
| tree | 270e7764e6fe54c982626bd2af294cedf4afbc5f /arch/blackfin/include/asm/flat.h | |
| parent | a5fa2660d787d8416f426cd622778a5d8851ac36 (diff) | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| download | linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.gz linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.bz2 linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.zip | |
Merge 4.13-rc2 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/blackfin/include/asm/flat.h')
| -rw-r--r-- | arch/blackfin/include/asm/flat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/flat.h b/arch/blackfin/include/asm/flat.h index 296d7f56fbfd..f1d6ba7afbf2 100644 --- a/arch/blackfin/include/asm/flat.h +++ b/arch/blackfin/include/asm/flat.h @@ -44,8 +44,7 @@ flat_get_relocate_addr (unsigned long relval) return relval & 0x03ffffff; /* Mask out top 6 bits */ } -static inline int flat_set_persistent(unsigned long relval, - unsigned long *persistent) +static inline int flat_set_persistent(u32 relval, u32 *persistent) { int type = (relval >> 26) & 7; if (type == 3) { |