diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-27 15:46:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-27 15:46:42 +1000 |
| commit | eebc9089124c49ffcc4321b5a912c2bc44e6fe9b (patch) | |
| tree | 1b9b53e2b28c67c4ff0bdcc06083ec80765bbaa4 | |
| parent | 91619ca191bc1465824d16021ba0af51677dabef (diff) | |
Revert "viafb: Do not probe for LVDS/TMDS on OLPC XO-1.5"
This reverts commit 78af0539da7b8069cb30023a3ec648e353849d3c.
| -rw-r--r-- | drivers/video/via/hw.c | 9 | ||||
| -rw-r--r-- | drivers/video/via/lcd.c | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index 1e989512e690..2322612fbb95 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c @@ -18,7 +18,7 @@ * Foundation, Inc., * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <asm/olpc.h> + #include "global.h" static struct pll_map pll_value[] = { @@ -2036,13 +2036,6 @@ static void init_gfx_chip_info(struct pci_dev *pdev, static void init_tmds_chip_info(void) { - /* - * OLPC XO 1.5 systems are wired differently, so there is - * no point in probing them here. - */ - if (machine_is_olpc()) - return; - viafb_tmds_trasmitter_identify(); if (INTERFACE_NONE == viaparinfo->chip_info->tmds_chip_info. diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c index b2da6dc08704..09020f0b2d2a 100644 --- a/drivers/video/via/lcd.c +++ b/drivers/video/via/lcd.c @@ -18,7 +18,7 @@ * Foundation, Inc., * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <asm/olpc.h> + #include "global.h" #include "lcdtbl.h" @@ -172,13 +172,6 @@ static bool lvds_identify_integratedlvds(void) int viafb_lvds_trasmitter_identify(void) { - /* - * OLPC XO 1.5 systems are wired differently, so there is - * no point in probing them here. - */ - if (machine_is_olpc()) - return FAIL; - viaparinfo->shared->i2c_stuff.i2c_port = I2CPORTINDEX; if (viafb_lvds_identify_vt1636()) { viaparinfo->chip_info->lvds_chip_info.i2c_port = I2CPORTINDEX; |