diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:37:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:37:09 -0400 |
| commit | 63518472c05a351d779f35803e6ccfb361ae630a (patch) | |
| tree | d3668e960f945a7a1204cfb839bc8aaabcdf2341 /drivers/acpi/asus_acpi.c | |
| parent | e44e20ff1273cf96c7f195297208f654c49295cf (diff) | |
| parent | e6f1f3c54974a30c65ea0b699809d12f0aa04272 (diff) | |
| download | linux-63518472c05a351d779f35803e6ccfb361ae630a.tar.gz linux-63518472c05a351d779f35803e6ccfb361ae630a.tar.bz2 linux-63518472c05a351d779f35803e6ccfb361ae630a.zip | |
Pull trivial1 into release branch
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 216c072dee5e..1a545489e859 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -817,7 +817,7 @@ typedef int (proc_writefunc) (struct file * file, const char __user * buffer, unsigned long count, void *data); static int -__init asus_proc_add(char *name, proc_writefunc * writefunc, +asus_proc_add(char *name, proc_writefunc * writefunc, proc_readfunc * readfunc, mode_t mode, struct acpi_device *device) { @@ -836,7 +836,7 @@ __init asus_proc_add(char *name, proc_writefunc * writefunc, return 0; } -static int __init asus_hotk_add_fs(struct acpi_device *device) +static int asus_hotk_add_fs(struct acpi_device *device) { struct proc_dir_entry *proc; mode_t mode; @@ -954,7 +954,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) * This function is used to initialize the hotk with right values. In this * method, we can make all the detection we want, and modify the hotk struct */ -static int __init asus_hotk_get_info(void) +static int asus_hotk_get_info(void) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL }; @@ -1101,7 +1101,7 @@ static int __init asus_hotk_get_info(void) return AE_OK; } -static int __init asus_hotk_check(void) +static int asus_hotk_check(void) { int result = 0; @@ -1119,7 +1119,7 @@ static int __init asus_hotk_check(void) return result; } -static int __init asus_hotk_add(struct acpi_device *device) +static int asus_hotk_add(struct acpi_device *device) { acpi_status status = AE_OK; int result; |