The patch titled
aoa: i2sbus: move module parameter declaration up
has been added to the -mm tree. Its filename is
aoa-i2sbus-move-module-parameter-declaration-up.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: aoa: i2sbus: move module parameter declaration up
From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
This patch moves the i2sbus 'force' module parameter declaration to the top of
the file.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/aoa/soundbus/i2sbus/i2sbus-core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN sound/aoa/soundbus/i2sbus/i2sbus-core.c~aoa-i2sbus-move-module-parameter-declaration-up sound/aoa/soundbus/i2sbus/i2sbus-core.c
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c~aoa-i2sbus-move-module-parameter-declaration-up
+++ a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -24,6 +24,11 @@ MODULE_DESCRIPTION("Apple Soundbus: I2S
* string that macio puts into the relevant device */
MODULE_ALIAS("of:Ni2sTi2sC");
+static int force;
+module_param(force, int, 0444);
+MODULE_PARM_DESC(force, "Force loading i2sbus even when"
+ " no layout-id property is present");
+
static struct of_device_id i2sbus_match[] = {
{ .name = "i2s" },
{ }
@@ -101,11 +106,6 @@ static irqreturn_t i2sbus_bus_intr(int i
return IRQ_HANDLED;
}
-static int force;
-module_param(force, int, 0444);
-MODULE_PARM_DESC(force, "Force loading i2sbus even when"
- " no layout-id property is present");
-
/* FIXME: look at device node refcounting */
static int i2sbus_add_dev(struct macio_dev *macio,
struct i2sbus_control *control,
_
Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are
fix-snd-aoa-irq-conversion.patch
aoa-i2sbus-move-module-parameter-declaration-up.patch
aoa-i2sbus-fix-for-powermac72-and-73.patch
aoa-fix-when-all-is-built-into-the-kernel.patch
aoa-i2sbus-revamp-control-layer.patch
aoa-pmf-gpio-report-if-function-calling-fails.patch
aoa-fabric-layout-clean-up-messages.patch
aoa-tas-fix-initialisation-reset.patch
macintosh-mangle-caps-lock-events-on-adb-keyboards.patch
git-powerpc.patch
git-powerpc-briq_panel-Kconfig-fix.patch
powermac-combined-fixes-for-backlight-code.patch
fix-broken-dubious-driver-suspend-methods.patch
apple-motion-sensor-driver.patch
genirq-convert-the-x86_64-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-irq-convert-the-move_irq-flag-from-a-32bit-word-to-a-single-bit.patch
genirq-irq-add-moved_masked_irq.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-msi-make-the-msi-boolean-tests-return-either-0-or-1.patch
genirq-msi-implement-helper-functions-read_msi_msg-and-write_msi_msg.patch
genirq-msi-refactor-the-msi_ops.patch
genirq-msi-simplify-the-msi-irq-limit-policy.patch
genirq-irq-add-a-dynamic-irq-creation-api.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-i386-irq-dynamic-irq-support.patch
genirq-x86_64-irq-dynamic-irq-support.patch
genirq-msi-make-the-msi-code-irq-based-and-not-vector-based.patch
genirq-x86_64-irq-move-msi-message-composition-into-io_apicc.patch
genirq-i386-irq-move-msi-message-composition-into-io_apicc.patch
genirq-msi-only-build-msi-apicc-on-ia64.patch
genirq-x86_64-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-irq-remove-msi-hacks.patch
genirq-irq-generalize-the-check-for-hardirq_bits.patch
genirq-x86_64-irq-make-the-external-irq-handlers-report-their-vector-not-the-irq-number.patch
genirq-x86_64-irq-make-vector_irq-per-cpu.patch
genirq-x86_64-irq-kill-gsi_irq_sharing.patch
genirq-x86_64-irq-kill-irq-compression.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
