diff options
| author | Len Brown <len.brown@intel.com> | 2008-04-30 13:59:05 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-30 13:59:05 -0400 |
| commit | 008238b54ac2350babf195084ecedbcf7851a202 (patch) | |
| tree | a7cc18ea0403f4478883a3e36a6f0d2bf67eef3e /drivers/pnp/pnpacpi/pnpacpi.h | |
| parent | 96916090f488986a4ebb8e9ffa6a3b50881d5ccd (diff) | |
| parent | dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1 (diff) | |
| download | op-kernel-dev-008238b54ac2350babf195084ecedbcf7851a202.zip op-kernel-dev-008238b54ac2350babf195084ecedbcf7851a202.tar.gz | |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/pnpacpi/pnpacpi.h')
| -rw-r--r-- | drivers/pnp/pnpacpi/pnpacpi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h index f28e2ed..3e60225 100644 --- a/drivers/pnp/pnpacpi/pnpacpi.h +++ b/drivers/pnp/pnpacpi/pnpacpi.h @@ -5,8 +5,8 @@ #include <linux/acpi.h> #include <linux/pnp.h> -acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*); -acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*); -int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *); -int pnpacpi_build_resource_template(acpi_handle, struct acpi_buffer*); +int pnpacpi_parse_allocated_resource(struct pnp_dev *); +int pnpacpi_parse_resource_option_data(struct pnp_dev *); +int pnpacpi_encode_resources(struct pnp_dev *, struct acpi_buffer *); +int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *); #endif |
