diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-03-04 14:06:05 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 16:06:14 -0600 |
| commit | e617d8c7d98b088f3a298cd5d74b97590f75eaa4 (patch) | |
| tree | 4d287d5203db9f994c3f421c4ed5392a5cb50b35 | |
| parent | ffab9e7338d2bdc46cb3529d7130315500ef0e61 (diff) | |
Revert "LINARO: WORKAROUND: Temporarily disable display on OMAP4"
This reverts commit f03bf640e07f4ba62db11963707eab048e230164.
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 8 | ||||
| -rw-r--r-- | debian.linaro/changelog | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 7973c67a45cf..cc7b4f3070d6 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -52,14 +52,6 @@ int __init omap_display_init(struct omap_dss_board_info struct omap_display_platform_data pdata; /* - * NB: This is temporary to have a headless panda until - * omap4 display works - */ - if (cpu_is_omap44xx()) { - printk(KERN_WARNING "Disabling OMAP display on OMAP4!!!!\n"); - return -ENODEV; - } - /* * omap: valid DSS hwmod names * omap2,3,4: dss_core, dss_dispc, dss_rfbi, dss_venc * omap3,4: dss_dsi1 diff --git a/debian.linaro/changelog b/debian.linaro/changelog index 9cfe31ad0b3b..bdff6dcea4ed 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -14,6 +14,7 @@ linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low Linux v2.6.38-rc7 linaro-linux-2.6.38-upstream-4Mar2011 ubuntu-natty master-next as of 4Mar2011 + * Re-enable display on OMAP4 -- John Rigby <john.rigby@linaro.org> Tue, 01 Mar 2011 14:11:33 -0700 |