summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 15:30:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 15:30:14 -0700
commit0db7443b2bd0b92da4e8afa46f8123a7076136c6 (patch)
tree325c388b7d99015896b583dfec775a837957b762 /arch/arm/mach-omap1
parent63068465fa9ba8258e341f70c07cd2221b8c114d (diff)
parent6df29debb7fc04ac3f92038c57437f40bab4e72d (diff)
downloadop-kernel-dev-0db7443b2bd0b92da4e8afa46f8123a7076136c6.zip
op-kernel-dev-0db7443b2bd0b92da4e8afa46f8123a7076136c6.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/board-voiceblue.c2
-rw-r--r--arch/arm/mach-omap1/serial.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 209d79e..bf30b1a 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -75,7 +75,7 @@ static struct plat_serial8250_port voiceblue_ports[] = {
static struct platform_device serial_device = {
.name = "serial8250",
- .id = 1,
+ .id = PLAT8250_DEV_PLATFORM1,
.dev = {
.platform_data = voiceblue_ports,
},
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index e702e0c..40c4f7c4 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -98,7 +98,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = {
.name = "serial8250",
- .id = 0,
+ .id = PLAT8250_DEV_PLATFORM,
.dev = {
.platform_data = serial_platform_data,
},
OpenPOWER on IntegriCloud