Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294332
b: refs/heads/master
c: f060f95
h: refs/heads/master
v: v3
  • Loading branch information
Tomi Valkeinen committed Feb 23, 2012
1 parent 78869bc commit 6e89638
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f5e35a7942afe70eb0ba0d8193801b7989ae03a
refs/heads/master: f060f95365ce71acbf29ef5dac580ab067600f4c
15 changes: 0 additions & 15 deletions trunk/arch/arm/plat-omap/fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ static struct platform_device omap_fb_device = {
.num_resources = 0,
};

void omapfb_set_platform_data(struct omapfb_platform_data *data)
{
}

static int __init omap_init_fb(void)
{
const struct omap_lcd_config *conf;
Expand Down Expand Up @@ -87,22 +83,11 @@ static struct platform_device omap_fb_device = {
.num_resources = 0,
};

void omapfb_set_platform_data(struct omapfb_platform_data *data)
{
omapfb_config = *data;
}

static int __init omap_init_fb(void)
{
return platform_device_register(&omap_fb_device);
}

arch_initcall(omap_init_fb);

#else

void omapfb_set_platform_data(struct omapfb_platform_data *data)
{
}

#endif
3 changes: 0 additions & 3 deletions trunk/include/linux/omapfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ struct omapfb_platform_data {
struct omap_lcd_config lcd;
};

/* in arch/arm/plat-omap/fb.c */
extern void omapfb_set_platform_data(struct omapfb_platform_data *data);

#endif

#endif /* __OMAPFB_H */

0 comments on commit 6e89638

Please sign in to comment.