diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /drivers/pnp/driver.c | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/driver.c')
| -rw-r--r-- | drivers/pnp/driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index 54673a4f5901..527ee764c93f 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c | |||
| @@ -205,6 +205,7 @@ struct bus_type pnp_bus_type = { | |||
| 205 | .remove = pnp_device_remove, | 205 | .remove = pnp_device_remove, |
| 206 | .suspend = pnp_bus_suspend, | 206 | .suspend = pnp_bus_suspend, |
| 207 | .resume = pnp_bus_resume, | 207 | .resume = pnp_bus_resume, |
| 208 | .dev_attrs = pnp_interface_attrs, | ||
| 208 | }; | 209 | }; |
| 209 | 210 | ||
| 210 | int pnp_register_driver(struct pnp_driver *drv) | 211 | int pnp_register_driver(struct pnp_driver *drv) |