diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 19:37:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 19:37:46 -0400 |
| commit | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (patch) | |
| tree | 46ae0ec07caf01fa5c743112ae8ee932d1e66854 /include | |
| parent | 301216244b1e39c4346e56d38b079ca53d528580 (diff) | |
| parent | 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index cf470459fa69..df94c0de53f2 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -273,9 +273,6 @@ struct device { | |||
| 273 | BIOS data relevant to device) */ | 273 | BIOS data relevant to device) */ |
| 274 | struct dev_pm_info power; | 274 | struct dev_pm_info power; |
| 275 | 275 | ||
| 276 | u32 detach_state; /* State to enter when device is | ||
| 277 | detached from its driver. */ | ||
| 278 | |||
| 279 | u64 *dma_mask; /* dma mask (if dma'able device) */ | 276 | u64 *dma_mask; /* dma mask (if dma'able device) */ |
| 280 | u64 coherent_dma_mask;/* Like dma_mask, but for | 277 | u64 coherent_dma_mask;/* Like dma_mask, but for |
| 281 | alloc_coherent mappings as | 278 | alloc_coherent mappings as |