diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-08 02:07:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-08 02:07:50 -0700 |
| commit | 07900f7ae5da5c09de2070af8e3e71c2ad1b63ed (patch) | |
| tree | 3d1c8b28572d1d8edf1afd81ab7bf95448ad0460 /include/linux | |
| parent | 6bd20e27f3594324acaa7e9b8609935c34e176cb (diff) | |
| parent | 59fb29c6b0cdc0d4e1281259033fabc958669466 (diff) | |
Merge bk://ldm.bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -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 1c35f87abc9e..053572009fa1 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -64,7 +64,7 @@ struct bus_type { struct driver_dir_entry device_dir; struct driver_dir_entry driver_dir; - int (*bind) (struct device * dev, struct device_driver * drv); + int (*match) (struct device * dev, struct device_driver * drv); }; |