diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:31:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:31:57 +0100 |
commit | a9de18eb761f7c1c860964b2e5addc1a35c7e861 (patch) | |
tree | 886e75fdfd09690cd262ca69cb7f5d1d42b48602 /arch/avr32/mach-at32ap/include/mach/board.h | |
parent | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (diff) | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c
Diffstat (limited to 'arch/avr32/mach-at32ap/include/mach/board.h')
-rw-r--r-- | arch/avr32/mach-at32ap/include/mach/board.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h index c48386d66bc..aafaf7a7888 100644 --- a/arch/avr32/mach-at32ap/include/mach/board.h +++ b/arch/avr32/mach-at32ap/include/mach/board.h @@ -14,8 +14,14 @@ */ extern unsigned long at32_board_osc_rates[]; -/* Add basic devices: system manager, interrupt controller, portmuxes, etc. */ -void at32_add_system_devices(void); +/* + * This used to add essential system devices, but this is now done + * automatically. Please don't use it in new board code. + */ +static inline void __deprecated at32_add_system_devices(void) +{ + +} #define ATMEL_MAX_UART 4 extern struct platform_device *atmel_default_console_device; |