diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:16 -0400 |
| commit | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch) | |
| tree | 3d053e76542ad4d20bd83ad35c13eabff97003ab /drivers | |
| parent | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (diff) | |
| parent | 3663b736a5083b3bce74520b637f630f01f66a7f (diff) | |
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/pata_at32.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 82fb6e273169..ab61095093b9 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | 26 | ||
| 27 | #include <asm/arch/board.h> | 27 | #include <mach/board.h> |
| 28 | #include <asm/arch/smc.h> | 28 | #include <mach/smc.h> |
| 29 | 29 | ||
| 30 | #define DRV_NAME "pata_at32" | 30 | #define DRV_NAME "pata_at32" |
| 31 | #define DRV_VERSION "0.0.3" | 31 | #define DRV_VERSION "0.0.3" |
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 992b4beb757c..0bd06f5bd62f 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 29 | #include <asm/unaligned.h> | 29 | #include <asm/unaligned.h> |
| 30 | 30 | ||
| 31 | #include <asm/arch/board.h> | 31 | #include <mach/board.h> |
| 32 | 32 | ||
| 33 | #include "atmel-mci-regs.h" | 33 | #include "atmel-mci-regs.h" |
| 34 | 34 | ||