diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 20:50:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 20:50:22 -0700 |
| commit | 098fc560ef2bbd1bde80845c898fa95db616eb6c (patch) | |
| tree | ca722c6fdbdffe9b7cfd31d61e8f4aae906a319c /include/linux/i2o.h | |
| parent | bffe01870598b7a0a77073e25ee94e026bc98e6b (diff) | |
| parent | 2a136606fe21b603a0ce484fc578f862f8e8384d (diff) | |
Trivial Makefile merge
Diffstat (limited to 'include/linux/i2o.h')
| -rw-r--r-- | include/linux/i2o.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/i2o.h b/include/linux/i2o.h index a68437640135..3481de9c5837 100644 --- a/include/linux/i2o.h +++ b/include/linux/i2o.h @@ -147,10 +147,10 @@ struct i2o_controller { struct pci_dev *pdev; /* PCI device */ - int short_req:1; /* use small block sizes */ - int no_quiesce:1; /* dont quiesce before reset */ - int raptor:1; /* split bar */ - int promise:1; /* Promise controller */ + unsigned int short_req:1; /* use small block sizes */ + unsigned int no_quiesce:1; /* dont quiesce before reset */ + unsigned int raptor:1; /* split bar */ + unsigned int promise:1; /* Promise controller */ #ifdef CONFIG_MTRR int mtrr_reg0; @@ -180,9 +180,9 @@ struct i2o_controller { struct i2o_dma in_queue; /* inbound message queue Host->IOP */ struct i2o_dma out_queue; /* outbound message queue IOP->Host */ - int battery:1; /* Has a battery backup */ - int io_alloc:1; /* An I/O resource was allocated */ - int mem_alloc:1; /* A memory resource was allocated */ + unsigned int battery:1; /* Has a battery backup */ + unsigned int io_alloc:1; /* An I/O resource was allocated */ + unsigned int mem_alloc:1; /* A memory resource was allocated */ struct resource io_resource; /* I/O resource allocated to the IOP */ struct resource mem_resource; /* Mem resource allocated to the IOP */ |