diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 16:21:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 16:21:00 +0100 |
| commit | 5bd30ed95b8b464efb0e345ae88f3c12be4f102c (patch) | |
| tree | a470124bcdce4f7519e82102433926e3c1e56d42 /drivers/spi | |
| parent | 95e40cc528dc7410a7d5883c9144264601b11e7c (diff) | |
| parent | 86db3b04fe386caa98bb4be00408f082b60a74b0 (diff) | |
Merge remote-tracking branch 'spi/topic/mxs' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-mxs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 62b7e8ee116..424d38e5942 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -46,7 +46,6 @@ #include <linux/gpio.h> #include <linux/regulator/consumer.h> #include <linux/module.h> -#include <linux/pinctrl/consumer.h> #include <linux/stmp_device.h> #include <linux/spi/spi.h> #include <linux/spi/mxs-spi.h> @@ -500,7 +499,6 @@ static int mxs_spi_probe(struct platform_device *pdev) struct mxs_spi *spi; struct mxs_ssp *ssp; struct resource *iores; - struct pinctrl *pinctrl; struct clk *clk; void __iomem *base; int devid, clk_freq; @@ -522,10 +520,6 @@ static int mxs_spi_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) - return PTR_ERR(pinctrl); - clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) return PTR_ERR(clk); |