diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 11:57:47 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 11:57:47 +0400 |
| commit | 04a4e1fdd248d7a19d53e6e90f757e99093e3d29 (patch) | |
| tree | ae16ad3f90d9dd726838077aae74675ba7ae51fc /drivers/net/wireless/libertas/if_spi.c | |
| parent | 19e737c98479f040e23987e50596a861e5e88b92 (diff) | |
| parent | e25aa82a89db9e3b09d02b5481aa375c7712a10d (diff) | |
| download | linux-04a4e1fdd248d7a19d53e6e90f757e99093e3d29.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/net/wireless/libertas/if_spi.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 4bb6574f4073..5d39ec880d84 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c @@ -1128,7 +1128,7 @@ static int if_spi_probe(struct spi_device *spi) { struct if_spi_card *card; struct lbs_private *priv = NULL; - struct libertas_spi_platform_data *pdata = spi->dev.platform_data; + struct libertas_spi_platform_data *pdata = dev_get_platdata(&spi->dev); int err = 0; lbs_deb_enter(LBS_DEB_SPI); |