diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 19:37:39 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 19:37:39 +0000 |
| commit | 64a9de8f07bf9ca909561c50d9f9e63bb7221b91 (patch) | |
| tree | 69ca086d847d80eb927556cfe74c5467c6dce038 /arch/arm/mach-omap2/display.c | |
| parent | f7f5ef0afdcca69fb02ded1763c28eca74e6b54d (diff) | |
| parent | c49d005b6cc8491fad5b24f82805be2d6bcbd3dd (diff) | |
| download | linux-64a9de8f07bf9ca909561c50d9f9e63bb7221b91.tar.gz linux-64a9de8f07bf9ca909561c50d9f9e63bb7221b91.tar.bz2 linux-64a9de8f07bf9ca909561c50d9f9e63bb7221b91.zip | |
Merge branch 'for-3.3-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index ffd9bd983023..d6e65e29d83d 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -102,12 +102,8 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) u32 reg; u16 control_i2c_1; - /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */ - omap_mux_init_signal("hdmi_hpd", - OMAP_PIN_INPUT_PULLUP); omap_mux_init_signal("hdmi_cec", OMAP_PIN_INPUT_PULLUP); - /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */ omap_mux_init_signal("hdmi_ddc_scl", OMAP_PIN_INPUT_PULLUP); omap_mux_init_signal("hdmi_ddc_sda", |