diff options
| author | Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc (diff) | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 (diff) | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c index 74cb0eb4531..78f0a677975 100644 --- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c +++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c @@ -66,35 +66,35 @@ static int sharp_ls_panel_probe(struct omap_dss_device *dssdev) dssdev->panel.timings = sharp_ls_timings; if (gpio_is_valid(pd->mo_gpio)) { - r = devm_gpio_request_one(&dssdev->dev, pd->mo_gpio, + r = devm_gpio_request_one(dssdev->dev, pd->mo_gpio, GPIOF_OUT_INIT_LOW, "lcd MO"); if (r) return r; } if (gpio_is_valid(pd->lr_gpio)) { - r = devm_gpio_request_one(&dssdev->dev, pd->lr_gpio, + r = devm_gpio_request_one(dssdev->dev, pd->lr_gpio, GPIOF_OUT_INIT_HIGH, "lcd LR"); if (r) return r; } if (gpio_is_valid(pd->ud_gpio)) { - r = devm_gpio_request_one(&dssdev->dev, pd->ud_gpio, + r = devm_gpio_request_one(dssdev->dev, pd->ud_gpio, GPIOF_OUT_INIT_HIGH, "lcd UD"); if (r) return r; } if (gpio_is_valid(pd->resb_gpio)) { - r = devm_gpio_request_one(&dssdev->dev, pd->resb_gpio, + r = devm_gpio_request_one(dssdev->dev, pd->resb_gpio, GPIOF_OUT_INIT_LOW, "lcd RESB"); if (r) return r; } if (gpio_is_valid(pd->ini_gpio)) { - r = devm_gpio_request_one(&dssdev->dev, pd->ini_gpio, + r = devm_gpio_request_one(dssdev->dev, pd->ini_gpio, GPIOF_OUT_INIT_LOW, "lcd INI"); if (r) return r; |