summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-05 07:47:21 -0500
committerTom Rini <trini@konsulko.com>2015-11-05 07:47:21 -0500
commited02c532be690b3d0c3e15c81531785a788fd949 (patch)
treefe6790c023fe118cb24d07106cddfc592a39d1e3 /arch
parent60b25259a5540686add02cf6c94cd7494a3e2d23 (diff)
parent4b6d09449fdeaa5659c5d277bdf133457521e70b (diff)
downloadu-boot-imx-ed02c532be690b3d0c3e15c81531785a788fd949.zip
u-boot-imx-ed02c532be690b3d0c3e15c81531785a788fd949.tar.gz
u-boot-imx-ed02c532be690b3d0c3e15c81531785a788fd949.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/cpu/jtag-console.c2
-rw-r--r--arch/powerpc/cpu/mpc8xx/video.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/cpu/jtag-console.c b/arch/blackfin/cpu/jtag-console.c
index b0abeda..29e7a44 100644
--- a/arch/blackfin/cpu/jtag-console.c
+++ b/arch/blackfin/cpu/jtag-console.c
@@ -183,7 +183,7 @@ int drv_jtag_console_init(void)
memset(&dev, 0x00, sizeof(dev));
strcpy(dev.name, "jtag");
- dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+ dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.putc = jtag_putc;
dev.puts = jtag_puts;
dev.tstc = jtag_tstc;
diff --git a/arch/powerpc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c
index 659e688..15cee3f 100644
--- a/arch/powerpc/cpu/mpc8xx/video.c
+++ b/arch/powerpc/cpu/mpc8xx/video.c
@@ -1089,7 +1089,6 @@ int drv_video_init (void)
memset (&videodev, 0, sizeof (videodev));
strcpy (videodev.name, "video");
- videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
videodev.flags = DEV_FLAGS_OUTPUT; /* Output only */
videodev.putc = video_putc; /* 'putc' function */
videodev.puts = video_puts; /* 'puts' function */