diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:36:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:36:04 +0100 |
| commit | 249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 (patch) | |
| tree | 58abfec8444741fd3bd403a908be50c4f63d4842 /drivers/net/irda | |
| parent | xen/hvc: constify hv_ops structures (diff) | |
| parent | Linux 4.5-rc4 (diff) | |
| download | linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.xz linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.zip | |
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/bfin_sir.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/irda/bfin_sir.h b/drivers/net/irda/bfin_sir.h index 29cbde8501ed..d47cf14bb4a5 100644 --- a/drivers/net/irda/bfin_sir.h +++ b/drivers/net/irda/bfin_sir.h @@ -82,9 +82,6 @@ struct bfin_sir_self { #define DRIVER_NAME "bfin_sir" -#define port_membase(port) (((struct bfin_sir_port *)(port))->membase) -#define get_lsr_cache(port) (((struct bfin_sir_port *)(port))->lsr) -#define put_lsr_cache(port, v) (((struct bfin_sir_port *)(port))->lsr = (v)) #include <asm/bfin_serial.h> static const unsigned short per[][4] = { |