diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /drivers/acpi/container.c | |
| parent | faac9bd0e3ce7cb0572ec66e0a426cacf6afa970 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/acpi/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 7f7e41d40a3b..871aa520ece7 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
| @@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle, | |||
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | end: | 238 | end: |
| 239 | acpi_os_free(buffer.pointer); | 239 | kfree(buffer.pointer); |
| 240 | 240 | ||
| 241 | return AE_OK; | 241 | return AE_OK; |
| 242 | } | 242 | } |