Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0db7443b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents 63068465 6df29deb

arch/arm/mach-clps7500/core.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,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,

	},

arch/arm/mach-ebsa110/core.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,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,

	},

arch/arm/mach-epxa10db/arch.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,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,

	},

arch/arm/mach-footbridge/isa.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,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,

	},

arch/arm/mach-h720x/cpu-h7202.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,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,

	},