diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 11:30:24 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 11:42:13 +0100 |
| commit | a614e1923d5389d01f3545ee4a90e39a04d0c90d (patch) | |
| tree | e8e32dba12a66ffd26d78f015a142ac28e19ad8e /drivers/spi/spi-pxa2xx.c | |
| parent | f53f292eeaa234615c31a1306babe703fc4263f2 (diff) | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| download | linux-rt-a614e1923d5389d01f3545ee4a90e39a04d0c90d.tar.gz | |
Merge tag 'v3.9' into efi-for-tip2
Resolve conflicts for Ingo.
Conflicts:
drivers/firmware/Kconfig
drivers/firmware/efivars.c
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 90b27a3508a6..810413883c79 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1168,7 +1168,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) master->dev.parent = &pdev->dev; master->dev.of_node = pdev->dev.of_node; - ACPI_HANDLE_SET(&master->dev, ACPI_HANDLE(&pdev->dev)); /* the spi->mode bits understood by this driver: */ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; |