diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/video/omap/omapfb_main.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/video/omap/omapfb_main.c')
| -rw-r--r-- | drivers/video/omap/omapfb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index e264efd0278f..b3ddd743d8a6 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
| @@ -90,7 +90,7 @@ static void omapdss_release(struct device *dev) | |||
| 90 | 90 | ||
| 91 | /* dummy device for clocks */ | 91 | /* dummy device for clocks */ |
| 92 | static struct platform_device omapdss_device = { | 92 | static struct platform_device omapdss_device = { |
| 93 | .name = "omapdss", | 93 | .name = "omapdss_dss", |
| 94 | .id = -1, | 94 | .id = -1, |
| 95 | .dev = { | 95 | .dev = { |
| 96 | .release = omapdss_release, | 96 | .release = omapdss_release, |