diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 05:43:52 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 05:43:52 +0300 |
commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /drivers/parisc/wax.c | |
parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
download | linux-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'drivers/parisc/wax.c')
-rw-r--r-- | drivers/parisc/wax.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c index 892a83bbe73d..da9d5ad1353c 100644 --- a/drivers/parisc/wax.c +++ b/drivers/parisc/wax.c @@ -68,8 +68,7 @@ wax_init_irq(struct gsc_asic *wax) // gsc_writel(0xFFFFFFFF, base+0x2000); /* RS232-B on Wax */ } -int __init -wax_init_chip(struct parisc_device *dev) +static int __init wax_init_chip(struct parisc_device *dev) { struct gsc_asic *wax; struct parisc_device *parent; |