diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /include/asm-avr32/arch-at32ap/init.h | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 (diff) | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-avr32/arch-at32ap/init.h')
| -rw-r--r-- | include/asm-avr32/arch-at32ap/init.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-avr32/arch-at32ap/init.h b/include/asm-avr32/arch-at32ap/init.h index 5e75d850d707..bc40e3d46150 100644 --- a/include/asm-avr32/arch-at32ap/init.h +++ b/include/asm-avr32/arch-at32ap/init.h | |||
| @@ -13,10 +13,6 @@ | |||
| 13 | void setup_platform(void); | 13 | void setup_platform(void); |
| 14 | void setup_board(void); | 14 | void setup_board(void); |
| 15 | 15 | ||
| 16 | /* Called by setup_platform */ | ||
| 17 | void at32_clock_init(void); | ||
| 18 | void at32_portmux_init(void); | ||
| 19 | |||
| 20 | void at32_setup_serial_console(unsigned int usart_id); | 16 | void at32_setup_serial_console(unsigned int usart_id); |
| 21 | 17 | ||
| 22 | #endif /* __ASM_AVR32_AT32AP_INIT_H__ */ | 18 | #endif /* __ASM_AVR32_AT32AP_INIT_H__ */ |