diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/spi/libertas_spi.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/spi/libertas_spi.h')
| -rw-r--r-- | include/linux/spi/libertas_spi.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/spi/libertas_spi.h b/include/linux/spi/libertas_spi.h index 79506f5f9e67..1b5d5384fcd3 100644 --- a/include/linux/spi/libertas_spi.h +++ b/include/linux/spi/libertas_spi.h | |||
| @@ -22,9 +22,6 @@ struct libertas_spi_platform_data { | |||
| 22 | * speed, you may want to use 0 here. */ | 22 | * speed, you may want to use 0 here. */ |
| 23 | u16 use_dummy_writes; | 23 | u16 use_dummy_writes; |
| 24 | 24 | ||
| 25 | /* GPIO number to use as chip select */ | ||
| 26 | u16 gpio_cs; | ||
| 27 | |||
| 28 | /* Board specific setup/teardown */ | 25 | /* Board specific setup/teardown */ |
| 29 | int (*setup)(struct spi_device *spi); | 26 | int (*setup)(struct spi_device *spi); |
| 30 | int (*teardown)(struct spi_device *spi); | 27 | int (*teardown)(struct spi_device *spi); |