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/spi_butterfly.c | |
| parent | 21eb4fa1700112d1420d72e1de708af671a251c8 (diff) | |
| parent | 07b2463046247ce580ff9b37e91394f2f6424768 (diff) | |
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/spi_butterfly.c')
| -rw-r--r-- | drivers/spi/spi_butterfly.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c index 31b7970ae46..312987a0321 100644 --- a/drivers/spi/spi_butterfly.c +++ b/drivers/spi/spi_butterfly.c @@ -246,7 +246,7 @@ static void butterfly_attach(struct parport *p) * and no way to be selective about what it binds to. */ - /* FIXME where should master->dev.parent come from? + /* FIXME where should master->cdev.dev come from? * e.g. /sys/bus/pnp0/00:0b, some PCI thing, etc * setting up a platform device like this is an ugly kluge... */ @@ -386,7 +386,7 @@ static void butterfly_detach(struct parport *p) butterfly = NULL; /* stop() unregisters child devices too */ - pdev = to_platform_device(pp->bitbang.master->dev.parent); + pdev = to_platform_device(pp->bitbang.master->cdev.dev); status = spi_bitbang_stop(&pp->bitbang); /* turn off VCC */ |