diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 15:05:29 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 15:05:29 (GMT) |
commit | b7d41a9fbb364c67d91c3588e117eba547e2d4bf (patch) | |
tree | abf95ce77eaa8b7aed30fded4d3592b4af152a99 /drivers/ieee1394/config_roms.h | |
parent | da47c19e5c746829042933c8f945a71e2b62d6fc (diff) | |
parent | 66fa12c571d35e3cd62574c65f1785a460105397 (diff) | |
download | linux-fsl-qoriq-b7d41a9fbb364c67d91c3588e117eba547e2d4bf.tar.xz |
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: remove the old IEEE 1394 driver stack
ieee1394: move init_ohci1394_dma to drivers/firewire/
Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
getting removed, but was modified by the networking merge.
Diffstat (limited to 'drivers/ieee1394/config_roms.h')
-rw-r--r-- | drivers/ieee1394/config_roms.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/ieee1394/config_roms.h b/drivers/ieee1394/config_roms.h deleted file mode 100644 index 1f5cd1f..0000000 --- a/drivers/ieee1394/config_roms.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _IEEE1394_CONFIG_ROMS_H -#define _IEEE1394_CONFIG_ROMS_H - -struct hpsb_host; - -int hpsb_default_host_entry(struct hpsb_host *host); -int hpsb_init_config_roms(void); -void hpsb_cleanup_config_roms(void); - -/* List of flags to check if a host contains a certain extra config rom - * entry. Available in the host->config_roms member. */ -#define HPSB_CONFIG_ROM_ENTRY_IP1394 0x00000001 - -#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY -int hpsb_config_rom_ip1394_add(struct hpsb_host *host); -void hpsb_config_rom_ip1394_remove(struct hpsb_host *host); -#endif - -#endif /* _IEEE1394_CONFIG_ROMS_H */ |