diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 12:31:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 12:31:00 -0400 |
| commit | bcc66c0b8881f88459f9ac21038455bcafacdc6e (patch) | |
| tree | b402e677253c3fc1038ca4a52fc54fc223261133 /arch/arm/plat-orion/common.c | |
| parent | 1c1b86215730ef07d8851c2247b9ecf73038d05d (diff) | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
Merge 3.5-rc4 into staging-next
This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/plat-orion/common.c')
| -rw-r--r-- | arch/arm/plat-orion/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 61fd837624a8..c1793786aea9 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c | |||
| @@ -582,7 +582,7 @@ void __init orion_spi_1_init(unsigned long mapbase) | |||
| 582 | * Watchdog | 582 | * Watchdog |
| 583 | ****************************************************************************/ | 583 | ****************************************************************************/ |
| 584 | static struct resource orion_wdt_resource = | 584 | static struct resource orion_wdt_resource = |
| 585 | DEFINE_RES_MEM(TIMER_VIRT_BASE, 0x28); | 585 | DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x28); |
| 586 | 586 | ||
| 587 | static struct platform_device orion_wdt_device = { | 587 | static struct platform_device orion_wdt_device = { |
| 588 | .name = "orion_wdt", | 588 | .name = "orion_wdt", |