diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-13 13:24:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-13 13:24:08 -0400 |
| commit | a4dc32374ed6dd56e09039ea8b7151c3a3e2307d (patch) | |
| tree | c1a5482db418ff1adb0135ac9d3abd01d138c2ad /include/linux | |
| parent | 51feb98d2547a389be2f666514f5bcd658f79eab (diff) | |
| parent | 38c7dc373029e4666b17850054dd43c1c96bb264 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
wm97xx_batery: replace driver_data with dev_get_drvdata()
omap: video: remove direct access of driver_data
Sound: remove direct access of driver_data
driver model: fix show/store prototypes in doc.
Firmware: firmware_class, fix lock imbalance
Driver Core: remove BUS_ID_SIZE
sparc: remove driver-core BUS_ID_SIZE
partitions: fix broken uevent_suppress conversion
devres: WARN() and return, don't crash on device_del() of uninitialized device
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index ed4e39f2c423..aebb81036db2 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -25,8 +25,6 @@ | |||
| 25 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 26 | #include <asm/device.h> | 26 | #include <asm/device.h> |
| 27 | 27 | ||
| 28 | #define BUS_ID_SIZE 20 | ||
| 29 | |||
| 30 | struct device; | 28 | struct device; |
| 31 | struct device_private; | 29 | struct device_private; |
| 32 | struct device_driver; | 30 | struct device_driver; |