diff options
| author | Anton Blanchard <anton@samba.org> | 2003-08-23 23:39:08 +1000 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-08-23 23:39:08 +1000 |
| commit | afb753ea258c299f0f4615917bd6f7d65fcaeca5 (patch) | |
| tree | b29d6cac75d5093374085a50dde41818e744d034 /include/linux/ide.h | |
| parent | 4665cdeef2451654762157c7c1c405fc4aae011b (diff) | |
| parent | ad556f8fd773a60cb5a2c08d42f3a68b61c5b982 (diff) | |
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/tmp3
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 82ca6da75b3f..a3ee36b438ca 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1241,8 +1241,6 @@ typedef struct ide_driver_s { #define DRIVER(drive) ((drive)->driver) extern int generic_ide_ioctl(struct block_device *, unsigned, unsigned long); -extern int generic_ide_suspend(struct device *dev, u32 state, u32 level); -extern int generic_ide_resume(struct device *dev, u32 level); /* * IDE modules. |