diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/cris/arch-v32/drivers/mach-a3 | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/cris/arch-v32/drivers/mach-a3')
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/gpio.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c index ef98608e5067..7a87bc0ae2e8 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c +++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
| 34 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 36 | #include <asm/arch/mach/pinmux.h> | 36 | #include <mach/pinmux.h> |
| 37 | 37 | ||
| 38 | #ifdef CONFIG_ETRAX_VIRTUAL_GPIO | 38 | #ifdef CONFIG_ETRAX_VIRTUAL_GPIO |
| 39 | #include "../i2c.h" | 39 | #include "../i2c.h" |
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c index 01ed0be2d0d1..25d6f2b3a721 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
| 19 | #include <linux/mtd/nand.h> | 19 | #include <linux/mtd/nand.h> |
| 20 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
| 21 | #include <asm/arch/memmap.h> | 21 | #include <arch/memmap.h> |
| 22 | #include <hwregs/reg_map.h> | 22 | #include <hwregs/reg_map.h> |
| 23 | #include <hwregs/reg_rdwr.h> | 23 | #include <hwregs/reg_rdwr.h> |
| 24 | #include <hwregs/pio_defs.h> | 24 | #include <hwregs/pio_defs.h> |