Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 167482
b: refs/heads/master
c: ac522b6
h: refs/heads/master
v: v3
  • Loading branch information
Michael Holzheu authored and Martin Schwidefsky committed Oct 14, 2009
1 parent 3435ba3 commit a50753e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d7c5afc890d0c9345ee05ccf0e6c692b6c8f8a8
refs/heads/master: ac522b638dcb549f9d33085c6fadea88a5f826ae
30 changes: 15 additions & 15 deletions trunk/drivers/s390/char/sclp_vt220.c
Original file line number Diff line number Diff line change
Expand Up @@ -705,21 +705,6 @@ static int __init sclp_vt220_tty_init(void)
}
__initcall(sclp_vt220_tty_init);

#ifdef CONFIG_SCLP_VT220_CONSOLE

static void
sclp_vt220_con_write(struct console *con, const char *buf, unsigned int count)
{
__sclp_vt220_write((const unsigned char *) buf, count, 1, 1, 0);
}

static struct tty_driver *
sclp_vt220_con_device(struct console *c, int *index)
{
*index = 0;
return sclp_vt220_driver;
}

static void __sclp_vt220_flush_buffer(void)
{
unsigned long flags;
Expand Down Expand Up @@ -776,6 +761,21 @@ static void sclp_vt220_pm_event_fn(struct sclp_register *reg,
}
}

#ifdef CONFIG_SCLP_VT220_CONSOLE

static void
sclp_vt220_con_write(struct console *con, const char *buf, unsigned int count)
{
__sclp_vt220_write((const unsigned char *) buf, count, 1, 1, 0);
}

static struct tty_driver *
sclp_vt220_con_device(struct console *c, int *index)
{
*index = 0;
return sclp_vt220_driver;
}

static int
sclp_vt220_notify(struct notifier_block *self,
unsigned long event, void *data)
Expand Down

0 comments on commit a50753e

Please sign in to comment.