diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-22 17:06:38 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-22 17:06:38 -0400 |
| commit | b3c7740a120c8a7775cb63b4d094466da5c01692 (patch) | |
| tree | 829761bf38b84630ca07b8fe7e34d4feaa7905dc /arch/arm/mach-omap2/board-zoom-debugboard.c | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
| parent | e6e8ea63f5d745e5a3030eec1964d0429b93107d (diff) | |
Merge branch 'omap-fixes-for-tony' of git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-debugboard.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-debugboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bb4018b60642..e15d2e87cfc1 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
| @@ -96,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
| 96 | 96 | ||
| 97 | static struct platform_device zoom_debugboard_serial_device = { | 97 | static struct platform_device zoom_debugboard_serial_device = { |
| 98 | .name = "serial8250", | 98 | .name = "serial8250", |
| 99 | .id = 3, | 99 | .id = PLAT8250_DEV_PLATFORM, |
| 100 | .dev = { | 100 | .dev = { |
| 101 | .platform_data = serial_platform_data, | 101 | .platform_data = serial_platform_data, |
| 102 | }, | 102 | }, |