The patch titled
via-pmu-add-input-device-tidy
has been added to the -mm tree. Its filename is
via-pmu-add-input-device-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
- Rename pmu_event() to via_pmu_event()
- Use __init
Cc: Pavel Machek <pavel@xxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
Cc: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: <linux-input@xxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dtor_core@xxxxxxxxxxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/macintosh/via-pmu-event.c | 6 +++---
drivers/macintosh/via-pmu-event.h | 2 +-
drivers/macintosh/via-pmu.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/macintosh/via-pmu.c~via-pmu-add-input-device-tidy drivers/macintosh/via-pmu.c
--- 25/drivers/macintosh/via-pmu.c~via-pmu-add-input-device-tidy Mon May 8 13:43:40 2006
+++ 25-akpm/drivers/macintosh/via-pmu.c Mon May 8 13:43:41 2006
@@ -1446,8 +1446,8 @@ next:
/* len == 6 is probably a bad check. But how do I
* know what PMU versions send what events here? */
if (len == 6) {
- pmu_event(PMU_EVT_POWER, !!(data[1]&8));
- pmu_event(PMU_EVT_LID, data[1]&1);
+ via_pmu_event(PMU_EVT_POWER, !!(data[1]&8));
+ via_pmu_event(PMU_EVT_LID, data[1]&1);
}
} else {
pmu_pass_intr(data, len);
diff -puN drivers/macintosh/via-pmu-event.c~via-pmu-add-input-device-tidy drivers/macintosh/via-pmu-event.c
--- 25/drivers/macintosh/via-pmu-event.c~via-pmu-add-input-device-tidy Mon May 8 13:43:41 2006
+++ 25-akpm/drivers/macintosh/via-pmu-event.c Mon May 8 13:43:41 2006
@@ -27,7 +27,7 @@
static struct input_dev *pmu_input_dev;
-static int pmu_event_init(void)
+static int __init via_pmu_event_init(void)
{
/* do other models report button/lid status? */
if (pmu_get_model() != PMU_KEYLARGO_BASED)
@@ -51,7 +51,7 @@ static int pmu_event_init(void)
return input_register_device(pmu_input_dev);
}
-void pmu_event(int key, int down)
+void via_pmu_event(int key, int down)
{
if (unlikely(!pmu_input_dev))
@@ -72,4 +72,4 @@ void pmu_event(int key, int down)
input_sync(pmu_input_dev);
}
-late_initcall(pmu_event_init);
+late_initcall(via_pmu_event_init);
diff -puN drivers/macintosh/via-pmu-event.h~via-pmu-add-input-device-tidy drivers/macintosh/via-pmu-event.h
--- 25/drivers/macintosh/via-pmu-event.h~via-pmu-add-input-device-tidy Mon May 8 13:43:41 2006
+++ 25-akpm/drivers/macintosh/via-pmu-event.h Mon May 8 13:43:41 2006
@@ -3,6 +3,6 @@
#define PMU_EVT_POWER 0
#define PMU_EVT_LID 1
-extern void pmu_event(int key, int down);
+extern void via_pmu_event(int key, int down);
#endif /* __VIA_PMU_EVENT_H */
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
autofs4-nfy_none-wait-race-fix-tidy.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
git-gfs2.patch
via-pmu-add-input-device-tidy.patch
git-libata-all.patch
git-mtd.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-powerpc.patch
git-rbtree.patch
git-sas.patch
git-serial.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
git-scsi-misc.patch
git-scsi-rc-fixes.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-watchdog.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-specify-node-id-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-3.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
catch-valid-mem-range-at-onlining-memory-tidy.patch
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
acx1xx-wireless-driver.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch
exit-dont-call-sleeping-things-when-oopsing.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
