diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-05 07:47:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-05 07:47:21 -0500 |
| commit | ed02c532be690b3d0c3e15c81531785a788fd949 (patch) | |
| tree | fe6790c023fe118cb24d07106cddfc592a39d1e3 /drivers | |
| parent | 60b25259a5540686add02cf6c94cd7494a3e2d23 (diff) | |
| parent | 4b6d09449fdeaa5659c5d277bdf133457521e70b (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/cros_ec_keyb.c | 2 | ||||
| -rw-r--r-- | drivers/input/keyboard.c | 2 | ||||
| -rw-r--r-- | drivers/input/tegra-kbc.c | 2 | ||||
| -rw-r--r-- | drivers/net/netconsole.c | 2 | ||||
| -rw-r--r-- | drivers/video/cfb_console.c | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c index a31aa77102..dd150eeb45 100644 --- a/drivers/input/cros_ec_keyb.c +++ b/drivers/input/cros_ec_keyb.c @@ -258,7 +258,7 @@ int drv_keyboard_init(void) memset(&dev, '\0', sizeof(dev)); strcpy(dev.name, "cros-ec-keyb"); - dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_INPUT; dev.getc = kbd_getc; dev.tstc = kbd_tstc; dev.start = cros_ec_init_keyboard; diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index be0f3330db..ca3886a18e 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -274,7 +274,7 @@ int kbd_init (void) return -1; memset (&kbddev, 0, sizeof(kbddev)); strcpy(kbddev.name, DEVNAME); - kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + kbddev.flags = DEV_FLAGS_INPUT; kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ; diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index c9c9fac5ad..6b88db4def 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -358,7 +358,7 @@ int drv_keyboard_init(void) memset(&dev, '\0', sizeof(dev)); strcpy(dev.name, "tegra-kbc"); - dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_INPUT; dev.getc = kbd_getc; dev.tstc = kbd_tstc; dev.start = init_tegra_keyboard; diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index bf972dc39b..3500047577 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -330,7 +330,7 @@ int drv_nc_init(void) memset(&dev, 0, sizeof(dev)); strcpy(dev.name, "nc"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.start = nc_stdio_start; dev.putc = nc_stdio_putc; dev.puts = nc_stdio_puts; diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index aa7ca8646d..556a55f65c 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2280,8 +2280,7 @@ int drv_video_init(void) /* Init vga device */ memset(&console_dev, 0, sizeof(console_dev)); strcpy(console_dev.name, "vga"); - console_dev.ext = DEV_EXT_VIDEO; /* Video extensions */ - console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM; + console_dev.flags = DEV_FLAGS_OUTPUT; console_dev.putc = video_putc; /* 'putc' function */ console_dev.puts = video_puts; /* 'puts' function */ |