diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-25 06:21:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-25 06:21:21 -0800 |
| commit | 67989cd62bcd70feedaa0099ea89da9066273dc7 (patch) | |
| tree | f3cbba6d0827f75ef524e2ea8bf1c6c694c89cb3 /include/linux | |
| parent | 18895b7ff6abc43e8ae538236787e227102a102c (diff) | |
| parent | 4cf210cdef3bd48e9b15add527b012355bb54377 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dio.h b/include/linux/dio.h index d42c86b9608d..fae9395fcf4f 100644 --- a/include/linux/dio.h +++ b/include/linux/dio.h @@ -254,7 +254,7 @@ static inline struct dio_driver *dio_dev_driver(const struct dio_dev *d) #define dio_resource_start(d) ((d)->resource.start) #define dio_resource_end(d) ((d)->resource.end) -#define dio_resource_len(d) ((d)->resource.end-(z)->resource.start+1) +#define dio_resource_len(d) ((d)->resource.end-(d)->resource.start+1) #define dio_resource_flags(d) ((d)->resource.flags) #define dio_request_device(d, name) \ |