diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
| commit | ba290ab7dace8b3339c0cc86c221d48eed21e956 (patch) | |
| tree | b2e5d1e96b2799cd13010b140ffabd43e8f04963 /drivers/acpi/asus_acpi.c | |
| parent | 9262e9149f346a5443300f8c451b8e7631e81a42 (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
| download | kernel_samsung_smdk4412-ba290ab7dace8b3339c0cc86c221d48eed21e956.tar.gz kernel_samsung_smdk4412-ba290ab7dace8b3339c0cc86c221d48eed21e956.tar.bz2 kernel_samsung_smdk4412-ba290ab7dace8b3339c0cc86c221d48eed21e956.zip | |
Pull kmalloc into release branch
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 055cfd5c876..eb0b8fb837c 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void) } hotk->methods = &model_conf[hotk->model]; - acpi_os_free(model); + kfree(model); return AE_OK; } @@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void) /* S1300A reports L84F, but L1400B too, account for that */ } - acpi_os_free(model); + kfree(model); return AE_OK; } @@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void) acpi_bus_unregister_driver(&asus_hotk_driver); remove_proc_entry(PROC_ASUS, acpi_root_dir); - acpi_os_free(asus_info); + kfree(asus_info); return; } |