mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits) param: don't deref arg in __same_type() checks param: update drivers/acpi/debug.c to new scheme param: use module_param in drivers/message/fusion/mptbase.c ide: use module_param_named rather than module_param_call param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes. param: lock myri10ge_fw_name against sysfs changes. param: simple locking for sysfs-writable charp parameters param: remove unnecessary writable charp param: add kerneldoc to moduleparam.h param: locking for kernel parameters param: make param sections const. param: use free hook for charp (fix leak of charp parameters) param: add a free hook to kernel_param_ops. param: silence .init.text references from param ops Add param ops struct for hvc_iucv driver. nfs: update for module_param_named API change AppArmor: update for module_param_named API change param: use ops in struct kernel_param, rather than get and set fns directly param: move the EXPORT_SYMBOL to after the definitions. ...
This commit is contained in:
commit
26df0766a7
30 changed files with 658 additions and 253 deletions
|
|
@ -1977,8 +1977,7 @@ static void __devexit uvesafb_exit(void)
|
|||
|
||||
module_exit(uvesafb_exit);
|
||||
|
||||
#define param_get_scroll NULL
|
||||
static int param_set_scroll(const char *val, struct kernel_param *kp)
|
||||
static int param_set_scroll(const char *val, const struct kernel_param *kp)
|
||||
{
|
||||
ypan = 0;
|
||||
|
||||
|
|
@ -1993,7 +1992,9 @@ static int param_set_scroll(const char *val, struct kernel_param *kp)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct kernel_param_ops param_ops_scroll = {
|
||||
.set = param_set_scroll,
|
||||
};
|
||||
#define param_check_scroll(name, p) __param_check(name, p, void)
|
||||
|
||||
module_param_named(scroll, ypan, scroll, 0);
|
||||
|
|
|
|||
|
|
@ -726,7 +726,9 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
|
|||
|
||||
/* Prepare startup mode */
|
||||
|
||||
kparam_block_sysfs_write(mode_option);
|
||||
rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
|
||||
kparam_unblock_sysfs_write(mode_option);
|
||||
if (! ((rc == 1) || (rc == 2))) {
|
||||
rc = -EINVAL;
|
||||
dev_err(info->device, "mode %s not found\n", mode_option);
|
||||
|
|
|
|||
Loading…
Reference in a new issue