diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-08 10:04:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-08 10:04:48 -0800 |
| commit | 43187902cbfafe73ede0144166b741fb0f7d04e1 (patch) | |
| tree | 6811915fddffdcacfc929d5a46800ced6f9b3db4 /drivers/spi/pxa2xx_spi.c | |
| parent | 21eb4fa1700112d1420d72e1de708af671a251c8 (diff) | |
| parent | 07b2463046247ce580ff9b37e91394f2f6424768 (diff) | |
| download | blackbird-op-linux-43187902cbfafe73ede0144166b741fb0f7d04e1.tar.gz blackbird-op-linux-43187902cbfafe73ede0144166b741fb0f7d04e1.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Revert "Driver core: convert SPI code to use struct device"
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index dccdc50b0296..8b41f9cc2560 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c @@ -1234,7 +1234,7 @@ static int init_queue(struct driver_data *drv_data) INIT_WORK(&drv_data->pump_messages, pump_messages); drv_data->workqueue = create_singlethread_workqueue( - drv_data->master->dev.parent->bus_id); + drv_data->master->cdev.dev->bus_id); if (drv_data->workqueue == NULL) return -EBUSY; |
