diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
| commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
| tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /drivers/acpi/dock.c | |
| parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
| parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 44f99bd83741..81514a4918cc 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -930,7 +930,7 @@ static struct attribute_group dock_attribute_group = { | |||
| 930 | * allocated and initialize a new dock station device. Find all devices | 930 | * allocated and initialize a new dock station device. Find all devices |
| 931 | * that are on the dock station, and register for dock event notifications. | 931 | * that are on the dock station, and register for dock event notifications. |
| 932 | */ | 932 | */ |
| 933 | static int dock_add(acpi_handle handle) | 933 | static int __init dock_add(acpi_handle handle) |
| 934 | { | 934 | { |
| 935 | int ret, id; | 935 | int ret, id; |
| 936 | struct dock_station ds, *dock_station; | 936 | struct dock_station ds, *dock_station; |
| @@ -1024,7 +1024,7 @@ static int dock_remove(struct dock_station *ds) | |||
| 1024 | * | 1024 | * |
| 1025 | * This is called by acpi_walk_namespace to look for dock stations. | 1025 | * This is called by acpi_walk_namespace to look for dock stations. |
| 1026 | */ | 1026 | */ |
| 1027 | static acpi_status | 1027 | static __init acpi_status |
| 1028 | find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) | 1028 | find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) |
| 1029 | { | 1029 | { |
| 1030 | if (is_dock(handle)) | 1030 | if (is_dock(handle)) |
| @@ -1033,7 +1033,7 @@ find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
| 1033 | return AE_OK; | 1033 | return AE_OK; |
| 1034 | } | 1034 | } |
| 1035 | 1035 | ||
| 1036 | static acpi_status | 1036 | static __init acpi_status |
| 1037 | find_bay(acpi_handle handle, u32 lvl, void *context, void **rv) | 1037 | find_bay(acpi_handle handle, u32 lvl, void *context, void **rv) |
| 1038 | { | 1038 | { |
| 1039 | /* If bay is a dock, it's already handled */ | 1039 | /* If bay is a dock, it's already handled */ |