diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/parisc/asp.c | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/parisc/asp.c')
| -rw-r--r-- | drivers/parisc/asp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c index 821369135369..7931133526c4 100644 --- a/drivers/parisc/asp.c +++ b/drivers/parisc/asp.c | |||
| @@ -71,8 +71,7 @@ static void asp_choose_irq(struct parisc_device *dev, void *ctrl) | |||
| 71 | */ | 71 | */ |
| 72 | #define ASP_INTERRUPT_ADDR 0xf0800000 | 72 | #define ASP_INTERRUPT_ADDR 0xf0800000 |
| 73 | 73 | ||
| 74 | int __init | 74 | static int __init asp_init_chip(struct parisc_device *dev) |
| 75 | asp_init_chip(struct parisc_device *dev) | ||
| 76 | { | 75 | { |
| 77 | struct gsc_irq gsc_irq; | 76 | struct gsc_irq gsc_irq; |
| 78 | int ret; | 77 | int ret; |