summaryrefslogtreecommitdiff
path: root/include/serial.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-05-04 22:49:15 +0200
committerWolfgang Denk <wd@denx.de>2010-05-04 22:49:15 +0200
commit900a1fe8c8c7acda1d8903af02c2d0d993b770d8 (patch)
treeb17bb283aa7fe7b31f46fbdfd3496b7f23736840 /include/serial.h
parent4185ae7a7146a77a792e5ba49845e5ca6e95b038 (diff)
parent20d98c2cea3398ad93beccd4727a371f41514086 (diff)
downloadolio-uboot-2014.01-900a1fe8c8c7acda1d8903af02c2d0d993b770d8.tar.xz
olio-uboot-2014.01-900a1fe8c8c7acda1d8903af02c2d0d993b770d8.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/serial.h')
-rw-r--r--include/serial.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/serial.h b/include/serial.h
index 6423fbaea..111edbec8 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -52,10 +52,10 @@ extern struct serial_device s3c24xx_serial2_device;
#endif
#if defined(CONFIG_S5PC1XX)
-extern struct serial_device s5pc1xx_serial0_device;
-extern struct serial_device s5pc1xx_serial1_device;
-extern struct serial_device s5pc1xx_serial2_device;
-extern struct serial_device s5pc1xx_serial3_device;
+extern struct serial_device s5p_serial0_device;
+extern struct serial_device s5p_serial1_device;
+extern struct serial_device s5p_serial2_device;
+extern struct serial_device s5p_serial3_device;
#endif
#if defined(CONFIG_OMAP3_ZOOM2)