diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-19 15:26:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-19 15:26:57 -0400 |
| commit | 7e2987503dda95a5f80290bb8c06279009c2419e (patch) | |
| tree | e841944c911ada8d2b806e13d2c7b7320adaeb2f /include | |
| parent | b1a45695bde0204597957e448923f09ce271ca80 (diff) | |
| parent | 49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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 cf470459fa..df94c0de53 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 |