Skip to content

L
linux-davinci
Commit a742e30b authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

Cleanup patch to sync with mainline kernel

parent fdd8a3fd
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
arch/arm/mach-omap2/serial.c
View file @ a742e30b
...@@ -167,7 +167,7 @@ void __init omap_serial_init() ...@@ -167,7 +167,7 @@ void __init omap_serial_init()
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },
......
arch/arm/plat-omap/fb.c
View file @ a742e30b
...@@ -20,14 +20,10 @@ static struct omapfb_platform_data omapfb_config; ...@@ -20,14 +20,10 @@ static struct omapfb_platform_data omapfb_config;
static u64 omap_fb_dma_mask = ~(u32)0; static u64 omap_fb_dma_mask = ~(u32)0;
/* in devices.c */
extern void omap_nop_release(struct device *dev);
static struct platform_device omap_fb_device = { static struct platform_device omap_fb_device = {
.name = "omapfb", .name = "omapfb",
.id = -1, .id = -1,
.dev = { .dev = {
.release = omap_nop_release,
.dma_mask = &omap_fb_dma_mask, .dma_mask = &omap_fb_dma_mask,
.coherent_dma_mask = ~(u32)0, .coherent_dma_mask = ~(u32)0,
.platform_data = &omapfb_config, .platform_data = &omapfb_config,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment