diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 06:42:12 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 06:42:12 -0400 |
| commit | b4ca761577535b2b4d153689ee97342797dfff05 (patch) | |
| tree | 29054d55508f1faa22ec32acf7c245751af03348 /drivers/spi/spi_lm70llp.c | |
| parent | 28f4197e5d4707311febeec8a0eb97cb5fd93c97 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/spi/spi_lm70llp.c')
| -rw-r--r-- | drivers/spi/spi_lm70llp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi_lm70llp.c b/drivers/spi/spi_lm70llp.c index 568c781ad91c..86fb7b5993db 100644 --- a/drivers/spi/spi_lm70llp.c +++ b/drivers/spi/spi_lm70llp.c | |||
| @@ -174,8 +174,7 @@ static inline int getmiso(struct spi_device *s) | |||
| 174 | } | 174 | } |
| 175 | /*--------------------------------------------------------------------*/ | 175 | /*--------------------------------------------------------------------*/ |
| 176 | 176 | ||
| 177 | #define EXPAND_BITBANG_TXRX 1 | 177 | #include "spi_bitbang_txrx.h" |
| 178 | #include <linux/spi/spi_bitbang.h> | ||
| 179 | 178 | ||
| 180 | static void lm70_chipselect(struct spi_device *spi, int value) | 179 | static void lm70_chipselect(struct spi_device *spi, int value) |
| 181 | { | 180 | { |