diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 01:27:27 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 01:27:31 -0800 |
| commit | 61da823ab9f1e554da58f1c9f75931829582ad4f (patch) | |
| tree | bb55b966f3da3de6ff0ccad70fca3dc16c35786d /arch/arm/mach-kirkwood/common.h | |
| parent | 0dfeada90989833d0144b4df25d2b9ce3746624f (diff) | |
| parent | 52cfa7e54b480661e20dfd8788a24cfcba8a0ca5 (diff) | |
Merge branch 'orion/dt' into next/dt
Merge in orion's cleanup branch together with the DT contents. Ideally
the cleanup branch should have been the base for the DT branch to avoid
these, but that was missed when first merging. So we're doing it now to
reduce the amount of silly conflicts due to internal tree organization.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/common.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 3e079d1d99d..5ffa57f08c8 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -47,7 +47,8 @@ void kirkwood_i2c_init(void); void kirkwood_uart0_init(void); void kirkwood_uart1_init(void); void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay); -void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *)); +void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, + int (*dev_ready)(struct mtd_info *)); void kirkwood_audio_init(void); void kirkwood_restart(char, const char *); void kirkwood_clk_init(void); |