diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /drivers/of/of_spi.c | |
| parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
| parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'drivers/of/of_spi.c')
| -rw-r--r-- | drivers/of/of_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c index f65f48b98448..5fed7e3c7da3 100644 --- a/drivers/of/of_spi.c +++ b/drivers/of/of_spi.c | |||
| @@ -79,7 +79,7 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np) | |||
| 79 | 79 | ||
| 80 | /* Store a pointer to the node in the device structure */ | 80 | /* Store a pointer to the node in the device structure */ |
| 81 | of_node_get(nc); | 81 | of_node_get(nc); |
| 82 | spi->dev.archdata.of_node = nc; | 82 | spi->dev.of_node = nc; |
| 83 | 83 | ||
| 84 | /* Register the new device */ | 84 | /* Register the new device */ |
| 85 | request_module(spi->modalias); | 85 | request_module(spi->modalias); |