diff options
author | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
commit | 3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch) | |
tree | ab8a881a14478598a0c8bda0d26c62cdccfffd6d /drivers/pnp/pnpacpi | |
parent | 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff) | |
parent | 9115a6c787596e687df03010d97fccc5e0762506 (diff) |
Pull release into acpica branch
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r-- | drivers/pnp/pnpacpi/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 1a8915e74160..816479ad217b 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
@@ -117,7 +117,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev) | |||
117 | return ACPI_FAILURE(status) ? -ENODEV : 0; | 117 | return ACPI_FAILURE(status) ? -ENODEV : 0; |
118 | } | 118 | } |
119 | 119 | ||
120 | struct pnp_protocol pnpacpi_protocol = { | 120 | static struct pnp_protocol pnpacpi_protocol = { |
121 | .name = "Plug and Play ACPI", | 121 | .name = "Plug and Play ACPI", |
122 | .get = pnpacpi_get_resources, | 122 | .get = pnpacpi_get_resources, |
123 | .set = pnpacpi_set_resources, | 123 | .set = pnpacpi_set_resources, |
@@ -234,7 +234,7 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle, | |||
234 | } | 234 | } |
235 | 235 | ||
236 | int pnpacpi_disabled __initdata; | 236 | int pnpacpi_disabled __initdata; |
237 | int __init pnpacpi_init(void) | 237 | static int __init pnpacpi_init(void) |
238 | { | 238 | { |
239 | if (acpi_disabled || pnpacpi_disabled) { | 239 | if (acpi_disabled || pnpacpi_disabled) { |
240 | pnp_info("PnP ACPI: disabled"); | 240 | pnp_info("PnP ACPI: disabled"); |
@@ -258,4 +258,6 @@ static int __init pnpacpi_setup(char *str) | |||
258 | } | 258 | } |
259 | __setup("pnpacpi=", pnpacpi_setup); | 259 | __setup("pnpacpi=", pnpacpi_setup); |
260 | 260 | ||
261 | #if 0 | ||
261 | EXPORT_SYMBOL(pnpacpi_protocol); | 262 | EXPORT_SYMBOL(pnpacpi_protocol); |
263 | #endif | ||