diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-04 18:18:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-04 18:18:21 -0800 |
| commit | 48818fe15745470d76a3768eef93569ded9c9fa5 (patch) | |
| tree | 9dbd2eb11cd1eb252631546fd677ba52ec57723b /include/linux/device.h | |
| parent | 93bc467d274f39059e2d15f93d53e89e1a00aae6 (diff) | |
| parent | 70faa195d4e1b6cddcc5c88987be1273eb8cab24 (diff) | |
Merge bk://linux-dj.bkbits.net/agpgart
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 6c43fdbbf23a..8f008e19b83f 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -372,7 +372,7 @@ extern int platform_device_register(struct platform_device *); extern void platform_device_unregister(struct platform_device *); extern struct bus_type platform_bus_type; -extern struct device legacy_bus; +extern struct device platform_bus; /* drivers/base/power.c */ extern void device_shutdown(void); |