diff options
| author | David Brownell <david-b@pacbell.net> | 2006-01-08 16:34:29 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 19:29:56 -0500 |
| commit | 7111763d391b0c5a949a4f2575aa88cd585f0ff6 (patch) | |
| tree | 376eef5003b71c6445c02bbe87950b2e365e0758 /drivers/spi/Makefile | |
| parent | 8275c642ccdce09a2146d0a9eb022e3698ee927e (diff) | |
[PATCH] spi: misc fixes
This collects some small SPI patches that seem to be missing from the MM tree:
- spi_butterfly kbuild hooks got dropped somehow; this restores them
- quick fix for a (theoretical?) m25p80_write() oops noted by Andrew
- quick fix for a potential config-specific oops for mtd_dataflash()
- minor doc tweaks
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/spi/Makefile')
| -rw-r--r-- | drivers/spi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 5da6a4df4012..c2c87e845abf 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile | |||
| @@ -12,6 +12,7 @@ obj-$(CONFIG_SPI_MASTER) += spi.o | |||
| 12 | 12 | ||
| 13 | # SPI master controller drivers (bus) | 13 | # SPI master controller drivers (bus) |
| 14 | obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o | 14 | obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o |
| 15 | obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o | ||
| 15 | # ... add above this line ... | 16 | # ... add above this line ... |
| 16 | 17 | ||
| 17 | # SPI protocol drivers (device/link on bus) | 18 | # SPI protocol drivers (device/link on bus) |