aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-07-10 07:44:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 16:24:18 -0400
commitf9d08de57b0beb6623a89d8a8f501040c5eadacb (patch)
tree81ae2c1178877e35508d3b01c5734042f90f0d8f /sound/aoa
parent4a14cf4508a77d03436f34a1f6a9bc3eee12fc08 (diff)
[PATCH] aoa: i2sbus: move module parameter declaration up
This patch moves the i2sbus 'force' module parameter declaration to the top of the file. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/aoa')
-rw-r--r--sound/aoa/soundbus/i2sbus/i2sbus-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 4f0c17eddece..8227dbbc994f 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -24,6 +24,11 @@ MODULE_DESCRIPTION("Apple Soundbus: I2S support");
24 * string that macio puts into the relevant device */ 24 * string that macio puts into the relevant device */
25MODULE_ALIAS("of:Ni2sTi2sC"); 25MODULE_ALIAS("of:Ni2sTi2sC");
26 26
27static int force;
28module_param(force, int, 0444);
29MODULE_PARM_DESC(force, "Force loading i2sbus even when"
30 " no layout-id property is present");
31
27static struct of_device_id i2sbus_match[] = { 32static struct of_device_id i2sbus_match[] = {
28 { .name = "i2s" }, 33 { .name = "i2s" },
29 { } 34 { }
@@ -101,11 +106,6 @@ static irqreturn_t i2sbus_bus_intr(int irq, void *devid, struct pt_regs *regs)
101 return IRQ_HANDLED; 106 return IRQ_HANDLED;
102} 107}
103 108
104static int force;
105module_param(force, int, 0444);
106MODULE_PARM_DESC(force, "Force loading i2sbus even when"
107 " no layout-id property is present");
108
109/* FIXME: look at device node refcounting */ 109/* FIXME: look at device node refcounting */
110static int i2sbus_add_dev(struct macio_dev *macio, 110static int i2sbus_add_dev(struct macio_dev *macio,
111 struct i2sbus_control *control, 111 struct i2sbus_control *control,