diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:49:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:49:55 -0500 |
| commit | 467388f29fc9cebfb70e7a187107b6b5d772cb44 (patch) | |
| tree | 4e6fffa65f38addffc149a5fe88be3d2161eaf6e /arch/arm/mach-at91/at91sam9263_devices.c | |
| parent | 028e1415a78733fcd2cba4b4c001826cc37a373e (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index b753cb879d8e..134af97ff340 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
| @@ -854,7 +854,7 @@ static void __init at91_add_device_rtt(void) | |||
| 854 | * Watchdog | 854 | * Watchdog |
| 855 | * -------------------------------------------------------------------- */ | 855 | * -------------------------------------------------------------------- */ |
| 856 | 856 | ||
| 857 | #if defined(CONFIG_AT91SAM9_WATCHDOG) || defined(CONFIG_AT91SAM9_WATCHDOG_MODULE) | 857 | #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE) |
| 858 | static struct platform_device at91sam9263_wdt_device = { | 858 | static struct platform_device at91sam9263_wdt_device = { |
| 859 | .name = "at91_wdt", | 859 | .name = "at91_wdt", |
| 860 | .id = -1, | 860 | .id = -1, |