diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /arch/arm/mach-versatile/core.c | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'arch/arm/mach-versatile/core.c')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 1f929c391af7..69214fc8bd19 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
| @@ -116,7 +116,7 @@ void __init versatile_init_irq(void) | |||
| 116 | { | 116 | { |
| 117 | unsigned int i; | 117 | unsigned int i; |
| 118 | 118 | ||
| 119 | vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0); | 119 | vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0); |
| 120 | 120 | ||
| 121 | set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq); | 121 | set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq); |
| 122 | 122 | ||
| @@ -413,7 +413,7 @@ static struct clk ref24_clk = { | |||
| 413 | .rate = 24000000, | 413 | .rate = 24000000, |
| 414 | }; | 414 | }; |
| 415 | 415 | ||
| 416 | static struct clk_lookup lookups[] __initdata = { | 416 | static struct clk_lookup lookups[] = { |
| 417 | { /* UART0 */ | 417 | { /* UART0 */ |
| 418 | .dev_id = "dev:f1", | 418 | .dev_id = "dev:f1", |
| 419 | .clk = &ref24_clk, | 419 | .clk = &ref24_clk, |