diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:43:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:43:21 -0400 |
| commit | 160acc2e899f26356bde92bc257253b7ca78f0c3 (patch) | |
| tree | c60782685ac0fdf4b2d6278c4be639181dd65126 /drivers/mmc/core/core.c | |
| parent | a7e1e001f432d5960b929787a2a261cf5a7ddac5 (diff) | |
| parent | c46f2334c84c2b26baa64d42d75ddc5fab38c3dc (diff) | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
[SG] Get rid of __sg_mark_end()
cleanup asm/scatterlist.h includes
SG: Make sg_init_one() use general table init functions
Diffstat (limited to 'drivers/mmc/core/core.c')
| -rw-r--r-- | drivers/mmc/core/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 09435e0ec68..b96667448eb 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/pagemap.h> | 19 | #include <linux/pagemap.h> |
| 20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 21 | #include <linux/leds.h> | 21 | #include <linux/leds.h> |
| 22 | #include <asm/scatterlist.h> | ||
| 23 | #include <linux/scatterlist.h> | 22 | #include <linux/scatterlist.h> |
| 24 | 23 | ||
| 25 | #include <linux/mmc/card.h> | 24 | #include <linux/mmc/card.h> |