diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:58:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:58:30 -0800 |
| commit | 08249903ea233a79b4167395f2fb79ccd1fb5f94 (patch) | |
| tree | 13285b46a495b578f721bb83024dae579466e089 /drivers | |
| parent | 0d6326a100d7aec588d7c1da9ad77ca7cc7c5b71 (diff) | |
| parent | 183b3af66eb71b5337be10d82dd177a8e3f414e1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Move syscalls.h under arch/avr32/include/asm/
avr32: Define DIE_OOPS
avr32: Remove DMATEST from defconfigs
arch/avr32: Eliminate NULL test and memset after alloc_bootmem
avr32: data param to at32_add_device_mci() must be non-NULL
atmel-mci: move atmel-mci.h file to include/linux
avr32: Hammerhead board support
avr32: Allow reserving multiple pins at once
favr-32: Remove deprecated call
MIMC200: Remove deprecated call
avr: struct device - replace bus_id with dev_name(), dev_set_name()
avr32: Introducing asm/syscalls.h
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 7a3f2436b01..1e97916914a 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -25,8 +25,8 @@ #include <linux/stat.h> #include <linux/mmc/host.h> +#include <linux/atmel-mci.h> -#include <asm/atmel-mci.h> #include <asm/io.h> #include <asm/unaligned.h> |