]> git.baikalelectronics.ru Git - kernel.git/commit
ACPI: fix build warnings resulting from merge window conflict
authorZhang Rui <rui.zhang@intel.com>
Mon, 30 Aug 2010 06:08:02 +0000 (14:08 +0800)
committerLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 01:38:01 +0000 (21:38 -0400)
commitdc876d5bca8fde906e210d302772a080a17e9391
tree919a8aba7db1327cd5d0091fb2b7bdc742d4b5f5
parent8258f8052bff5ae0035509193ca8bb7295e2206c
ACPI: fix build warnings resulting from merge window conflict

drivers/acpi/sysfs.c:154: warning: passing argument 1 of '__check_old_set_param' from incompatible pointer type
include/linux/moduleparam.h:165: note: expected 'int (*)(const char *, struct kernel_param *)' but argument is of type 'int (*)(const char *, const struct kernel_param *)'

Introduced by commit 11a6eb953bea7af1635c7abb22ca21b51e9fc02f ("ACPI:
introduce drivers/acpi/sysfs.c") interacting with commit
b9a25f53474167dee2cb3a5768fa0c737ab8f22f ("param: use ops in struct
kernel_param, rather than get and set fns directly").

Use module_param_cb instead of the obsoleted module_param_call to fix a build warning.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/sysfs.c