Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25

This commit is contained in:
Paul Mackerras 2008-01-17 16:17:58 +11:00
commit 52920df4aa
11 changed files with 227 additions and 180 deletions

View file

@ -15,4 +15,13 @@ struct pata_platform_info {
unsigned int irq_flags;
};
extern int __devinit __pata_platform_probe(struct device *dev,
struct resource *io_res,
struct resource *ctl_res,
struct resource *irq_res,
unsigned int ioport_shift,
int __pio_mask);
extern int __devexit __pata_platform_remove(struct device *dev);
#endif /* __LINUX_PATA_PLATFORM_H */