diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 10:46:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 10:46:08 -0500 |
| commit | cd6a22310ec2a70092e136d0cd65bb77c1502521 (patch) | |
| tree | c01fa788b27b240c7b426d7f329d92bd58c7b8f5 /arch/sh/include | |
| parent | 1e12a521d6917004f8b95a3b5864b92edc2694c8 (diff) | |
| parent | 177c459b08a34dcf004aa9a4c1f1d8be682ff3af (diff) | |
Merge USB 4.20-rc8 mergepoint into usb-next
We need the USB changes in here for additional patches to be able to
apply cleanly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 98cb8c802b1a..4f7f235f15f8 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #define __IO_PREFIX generic | 24 | #define __IO_PREFIX generic |
| 25 | #include <asm/io_generic.h> | 25 | #include <asm/io_generic.h> |
| 26 | #include <asm/io_trapped.h> | 26 | #include <asm/io_trapped.h> |
| 27 | #include <asm-generic/pci_iomap.h> | ||
| 27 | #include <mach/mangle-port.h> | 28 | #include <mach/mangle-port.h> |
| 28 | 29 | ||
| 29 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile u8 __force *)(a) = (v)) | 30 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile u8 __force *)(a) = (v)) |