diff options
| author | Justin Waters <justin.waters@timesys.com> | 2012-08-02 12:11:13 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-08-02 12:11:13 -0400 |
| commit | 101eca5af60e95bae2ba642ef93681bb184107bc (patch) | |
| tree | 5bf8ba4075671d5e3d45dcc40d971ad057e77c48 /drivers/char/ftimer.c | |
| parent | a7e93790bb050e8d4bc1982550e8fc44a0747b49 (diff) | |
| parent | 2bcc4aedaf8fb4e022ae9f80bf36926367b8c5f6 (diff) | |
Merge remote-tracking branch 'github/3.0-vybrid-lineo' into 3.0-vybrid
Conflicts:
arch/arm/mach-mvf/board-twr_vf600.c
Diffstat (limited to 'drivers/char/ftimer.c')
| -rw-r--r-- | drivers/char/ftimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ftimer.c b/drivers/char/ftimer.c index 88a31997ef8f..9fe19fa70475 100644 --- a/drivers/char/ftimer.c +++ b/drivers/char/ftimer.c @@ -311,7 +311,7 @@ int ftm_probe(struct platform_device *pdev) struct resource *ftm_membase, *ftm_irq; struct mvf_ftm_dev *timedevptr; - ftm_membase = platform_get_resource(pdev, IORESOURCE_MEM, 1); + ftm_membase = platform_get_resource(pdev, IORESOURCE_MEM, 0); ftm_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!ftm_irq || !ftm_membase){ @@ -353,6 +353,7 @@ int ftm_probe(struct platform_device *pdev) platform_set_drvdata(pdev, timedevptr); timer_master_register_platform(pdev); + printk (KERN_INFO "Flex Timer Module Driver (id = %d) Installed.\n", pdev->id); return 0; } |