diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 02:17:14 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 02:17:14 -0400 |
commit | 9e4144abf8a30ae221311368bbb10690ebdb4b76 (patch) | |
tree | 032289d5b7d87976675c1a1a32d512a44d234fa2 /include/linux/spi/mmc_spi.h | |
parent | e17ba73b0ee6c0f24393c48b455e0d8db761782c (diff) | |
parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) |
Merge branch 'linus' into core/printk
Conflicts:
kernel/printk.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/spi/mmc_spi.h')
-rw-r--r-- | include/linux/spi/mmc_spi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h index e9bbe3ebd721..d5ca78b93a3b 100644 --- a/include/linux/spi/mmc_spi.h +++ b/include/linux/spi/mmc_spi.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef __LINUX_SPI_MMC_SPI_H | 1 | #ifndef __LINUX_SPI_MMC_SPI_H |
2 | #define __LINUX_SPI_MMC_SPI_H | 2 | #define __LINUX_SPI_MMC_SPI_H |
3 | 3 | ||
4 | #include <linux/interrupt.h> | ||
5 | |||
4 | struct device; | 6 | struct device; |
5 | struct mmc_host; | 7 | struct mmc_host; |
6 | 8 | ||