diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
| commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
| tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /drivers/infiniband/hw/ipath/ipath_kernel.h | |
| parent | e52b29c2a637f6854d71a45646d7283d984a6dad (diff) | |
| parent | 10b1fbdb0a0ca91847a534ad26d0bc250c25b74f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_kernel.h')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_kernel.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h index 7c436697d0e4..06d5020a2f60 100644 --- a/drivers/infiniband/hw/ipath/ipath_kernel.h +++ b/drivers/infiniband/hw/ipath/ipath_kernel.h | |||
| @@ -869,9 +869,6 @@ int ipath_device_create_group(struct device *, struct ipath_devdata *); | |||
| 869 | void ipath_device_remove_group(struct device *, struct ipath_devdata *); | 869 | void ipath_device_remove_group(struct device *, struct ipath_devdata *); |
| 870 | int ipath_expose_reset(struct device *); | 870 | int ipath_expose_reset(struct device *); |
| 871 | 871 | ||
| 872 | int ipath_diagpkt_add(void); | ||
| 873 | void ipath_diagpkt_remove(void); | ||
| 874 | |||
| 875 | int ipath_init_ipathfs(void); | 872 | int ipath_init_ipathfs(void); |
| 876 | void ipath_exit_ipathfs(void); | 873 | void ipath_exit_ipathfs(void); |
| 877 | int ipathfs_add_device(struct ipath_devdata *); | 874 | int ipathfs_add_device(struct ipath_devdata *); |