diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-24 15:08:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-24 15:08:26 -0500 |
| commit | db8862eafe8a5d030a3b02e81b8bb47447c315e3 (patch) | |
| tree | 073ea7b46809bf804134cbf008a593413c02a99c /arch/avr32/boards/favr-32/flash.c | |
| parent | c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9 (diff) | |
| parent | c20137fc5329eaf24093fc48c52608dc66be8e5c (diff) | |
Merge branch 'linus' into tracing/hw-branch-tracing
Diffstat (limited to 'arch/avr32/boards/favr-32/flash.c')
| -rw-r--r-- | arch/avr32/boards/favr-32/flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/favr-32/flash.c b/arch/avr32/boards/favr-32/flash.c index 5f139b7cb5f7..604bbd5e41d9 100644 --- a/arch/avr32/boards/favr-32/flash.c +++ b/arch/avr32/boards/favr-32/flash.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/mtd/partitions.h> | 13 | #include <linux/mtd/partitions.h> |
| 14 | #include <linux/mtd/physmap.h> | 14 | #include <linux/mtd/physmap.h> |
| 15 | 15 | ||
| 16 | #include <asm/arch/smc.h> | 16 | #include <mach/smc.h> |
| 17 | 17 | ||
| 18 | static struct smc_timing flash_timing __initdata = { | 18 | static struct smc_timing flash_timing __initdata = { |
| 19 | .ncs_read_setup = 0, | 19 | .ncs_read_setup = 0, |