diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 15:01:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 15:01:02 -0500 |
| commit | 69098bac169d630a777b362470f20451b9446e39 (patch) | |
| tree | af916fdbdb51940ec6050628401d300c83d129a9 /arch/avr32/boards/favr-32/flash.c | |
| parent | b3806c3b940540ba9386a334ff0cc2597a5af60e (diff) | |
| parent | 8983fdb50878ae6fa2ced336ef6072f8d5d502e3 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: favr-32 build fix
ATSTK1006: Fix boot from NAND flash
avr32: remove .note.gnu.build-id section when making vmlinux.bin
avr32: Enable pullup on USART TX lines
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, |