projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
[cascardo/linux.git]
/
drivers
/
s390
/
char
/
raw3270.c
diff --git
a/drivers/s390/char/raw3270.c
b/drivers/s390/char/raw3270.c
index
d6a022f
..
62ddf52
100644
(file)
--- a/
drivers/s390/char/raw3270.c
+++ b/
drivers/s390/char/raw3270.c
@@
-1361,11
+1361,13
@@
static int raw3270_pm_start(struct ccw_device *cdev)
void raw3270_pm_unfreeze(struct raw3270_view *view)
{
void raw3270_pm_unfreeze(struct raw3270_view *view)
{
+#ifdef CONFIG_TN3270_CONSOLE
struct raw3270 *rp;
rp = view->dev;
if (rp && test_bit(RAW3270_FLAGS_FROZEN, &rp->flags))
ccw_device_force_console();
struct raw3270 *rp;
rp = view->dev;
if (rp && test_bit(RAW3270_FLAGS_FROZEN, &rp->flags))
ccw_device_force_console();
+#endif
}
static struct ccw_device_id raw3270_id[] = {
}
static struct ccw_device_id raw3270_id[] = {