diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /include/linux/dio.h | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'include/linux/dio.h')
| -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 1e65ebc2a3db..b2dd31ca1710 100644 --- a/include/linux/dio.h +++ b/include/linux/dio.h | |||
| @@ -241,7 +241,7 @@ struct dio_driver { | |||
| 241 | 241 | ||
| 242 | extern int dio_find(int deviceid); | 242 | extern int dio_find(int deviceid); |
| 243 | extern unsigned long dio_scodetophysaddr(int scode); | 243 | extern unsigned long dio_scodetophysaddr(int scode); |
| 244 | extern void dio_create_sysfs_dev_files(struct dio_dev *); | 244 | extern int dio_create_sysfs_dev_files(struct dio_dev *); |
| 245 | 245 | ||
| 246 | /* New-style probing */ | 246 | /* New-style probing */ |
| 247 | extern int dio_register_driver(struct dio_driver *); | 247 | extern int dio_register_driver(struct dio_driver *); |