diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:45:04 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:45:04 +0200 |
| commit | 4297103560b4c5aba904e4711e982a039619f1f6 (patch) | |
| tree | 772c527706c8d7677d79390ac3336af11bcc34e2 /drivers/spi/spi.c | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | 8ceffa7c4a4c378d8e371fe2f444656e75390b34 (diff) | |
Merge tag 'spi-3.6' into v3.5-rc7-dt-v3
spi: Updates for 3.6
Since Grant is even more specacularly busy than usual for the time being
I've been collecting SPI patches for him for this release - probably
things will revert back to Grant before the next release. There's
nothing too exciting here, mostly it's simple driver specific stuff:
- Add spi: to the modaliases of SPI devices to provide namespacing.
- A driver for AD-FMCOMMS1-EBZ.
- DT binding for Orion.
- Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers.
There may be a few more fixes I've missed, people keep sending me new
things.
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 1041cb83d67a..84c2861d6f4d 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -53,7 +53,7 @@ modalias_show(struct device *dev, struct device_attribute *a, char *buf) { const struct spi_device *spi = to_spi_device(dev); - return sprintf(buf, "%s\n", spi->modalias); + return sprintf(buf, "%s%s\n", SPI_MODULE_PREFIX, spi->modalias); } static struct device_attribute spi_dev_attrs[] = { |