Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...

[~andy/linux] / drivers / zorro / zorro.h

extern void zorro_name_device(struct zorro_dev *z);
extern int zorro_create_sysfs_dev_files(struct zorro_dev *z);