diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-10-08 18:03:08 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-10-08 18:03:08 -0700 |
| commit | d745be1ef2499bbc1d7e648316ca51d272120825 (patch) | |
| tree | 07c963d04b817e66ec8efa127d8589e13bfca7d3 /include/linux | |
| parent | 8e12e1f9fdc413418e3bac8776f40a341ff77b4a (diff) | |
| parent | 3c0405be3311c5db2a396a6c3533d657d34e3896 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 0d4da3049061..3290c5c40276 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -289,6 +289,7 @@ struct device { void *platform_data; /* Platform specific data (e.g. ACPI, BIOS data relevant to device) */ + u32 present; u32 current_state; /* Current operating state. In ACPI-speak, this is D0-D3, D0 being fully functional, and D3 @@ -327,7 +328,7 @@ dev_set_drvdata (struct device *dev, void *data) * High level routines for use by the bus drivers */ extern int device_register(struct device * dev); - +extern void device_unregister(struct device * dev); /* driverfs interface for exporting device attributes */ |