diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 22:27:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 22:27:36 +0100 |
| commit | 9f9cba810f36d16f4e64477e879a69f6c47b389d (patch) | |
| tree | d787abcbead1439d3f82f0719efe520fd9689f79 /drivers/s390/char/raw3270.c | |
| parent | serial: tegra: Fix compilation error (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | linux-9f9cba810f36d16f4e64477e879a69f6c47b389d.tar.xz linux-9f9cba810f36d16f4e64477e879a69f6c47b389d.zip | |
Merge 3.8-rc5 into tty-next
This resolves a number of tty driver merge issues found in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/char/raw3270.c')
| -rw-r--r-- | drivers/s390/char/raw3270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index f3b8bb84faf2..9a6c140c5f07 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c @@ -1396,7 +1396,7 @@ static struct ccw_driver raw3270_ccw_driver = { .freeze = &raw3270_pm_stop, .thaw = &raw3270_pm_start, .restore = &raw3270_pm_start, - .int_class = IOINT_C70, + .int_class = IRQIO_C70, }; static int |