diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/message/i2o/iop.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/i2o/iop.c')
| -rw-r--r-- | drivers/message/i2o/iop.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index febbdd4e0605..c74e5460f834 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
| @@ -1239,7 +1239,6 @@ EXPORT_SYMBOL(i2o_cntxt_list_remove); | |||
| 1239 | EXPORT_SYMBOL(i2o_cntxt_list_get_ptr); | 1239 | EXPORT_SYMBOL(i2o_cntxt_list_get_ptr); |
| 1240 | #endif | 1240 | #endif |
| 1241 | EXPORT_SYMBOL(i2o_msg_get_wait); | 1241 | EXPORT_SYMBOL(i2o_msg_get_wait); |
| 1242 | EXPORT_SYMBOL(i2o_msg_nop); | ||
| 1243 | EXPORT_SYMBOL(i2o_find_iop); | 1242 | EXPORT_SYMBOL(i2o_find_iop); |
| 1244 | EXPORT_SYMBOL(i2o_iop_find_device); | 1243 | EXPORT_SYMBOL(i2o_iop_find_device); |
| 1245 | EXPORT_SYMBOL(i2o_event_register); | 1244 | EXPORT_SYMBOL(i2o_event_register); |