diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-29 16:11:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-29 16:11:26 -0500 |
| commit | 30088a25e9c4dc1f8bd5c48b14a18633441b5481 (patch) | |
| tree | 522124a1ec4b39d18f3af6c8f3a169f59aee9de9 /drivers/net/ethernet/sfc/spi.h | |
| parent | c45a3dfb59c0f17bdbd294dd01efb2d7f99a32c7 (diff) | |
| parent | db3395697cad6e9dff8d21249e0b59dc9bb83b48 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Diffstat (limited to 'drivers/net/ethernet/sfc/spi.h')
| -rw-r--r-- | drivers/net/ethernet/sfc/spi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/spi.h b/drivers/net/ethernet/sfc/spi.h index 71f2e3ebe1c..5431a1bbff5 100644 --- a/drivers/net/ethernet/sfc/spi.h +++ b/drivers/net/ethernet/sfc/spi.h @@ -68,7 +68,7 @@ static inline bool efx_spi_present(const struct efx_spi_device *spi) int falcon_spi_cmd(struct efx_nic *efx, const struct efx_spi_device *spi, unsigned int command, - int address, const void* in, void *out, size_t len); + int address, const void *in, void *out, size_t len); int falcon_spi_wait_write(struct efx_nic *efx, const struct efx_spi_device *spi); int falcon_spi_read(struct efx_nic *efx, |