diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
commit | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch) | |
tree | 0b8ed22d46d775f04d441e8c480c12ec297a005b /arch/arm/mach-at91/at91cap9_devices.c | |
parent | 00a8bf859331e349713274825e6fbf20bf2ac15a (diff) | |
parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
download | kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.gz kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.bz2 kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip |
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'arch/arm/mach-at91/at91cap9_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91cap9_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 9eca2209cde..412aa49ad2f 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c @@ -697,7 +697,7 @@ static void __init at91_add_device_rtt(void) * Watchdog * -------------------------------------------------------------------- */ -#if defined(CONFIG_AT91SAM9_WATCHDOG) || defined(CONFIG_AT91SAM9_WATCHDOG_MODULE) +#if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE) static struct platform_device at91cap9_wdt_device = { .name = "at91_wdt", .id = -1, |