← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/soc/omap/omap-hdmi.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/omap/omap-hdmi.c
25
25
#include <linux/init.h>
26
26
#include <linux/module.h>
27
27
#include <linux/device.h>
 
28
#include <linux/display.h>
28
29
#include <sound/core.h>
29
30
#include <sound/pcm.h>
30
31
#include <sound/pcm_params.h>
31
32
#include <sound/initval.h>
32
33
#include <sound/soc.h>
 
34
#include <video/omapdss.h>
33
35
 
34
36
#include <plat/dma.h>
35
 
#include <plat/display.h>
36
37
#include <plat/omap44xx.h>
37
38
#include "omap-pcm.h"
38
39
#include "omap-hdmi.h"
69
70
                printk(KERN_ERR "HDMI display is not active!");
70
71
                return -EIO;
71
72
        }
 
73
 
72
74
        return err;
73
75
}
74
76