diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-17 00:17:58 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-17 00:17:58 -0500 |
| commit | 52920df4aa9dd25836b8ed4dc0b177ea14c09e53 (patch) | |
| tree | 47b3fab4849f7faeaaf88e2ca8dcc911a0c39103 /include | |
| parent | 0173d422aa32fa1e5141f1759202b955215c1da2 (diff) | |
| parent | 9cd55be4d22376893d2818ce3c0e5706a3d74121 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pata_platform.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pata_platform.h b/include/linux/pata_platform.h index 5799e8d50623..6a7a92db294c 100644 --- a/include/linux/pata_platform.h +++ b/include/linux/pata_platform.h | |||
| @@ -15,4 +15,13 @@ struct pata_platform_info { | |||
| 15 | unsigned int irq_flags; | 15 | unsigned int irq_flags; |
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | extern int __devinit __pata_platform_probe(struct device *dev, | ||
| 19 | struct resource *io_res, | ||
| 20 | struct resource *ctl_res, | ||
| 21 | struct resource *irq_res, | ||
| 22 | unsigned int ioport_shift, | ||
| 23 | int __pio_mask); | ||
| 24 | |||
| 25 | extern int __devexit __pata_platform_remove(struct device *dev); | ||
| 26 | |||
| 18 | #endif /* __LINUX_PATA_PLATFORM_H */ | 27 | #endif /* __LINUX_PATA_PLATFORM_H */ |