diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/firewire/fw-device.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/firewire/fw-device.h')
| -rw-r--r-- | drivers/firewire/fw-device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h index df51732608d9..8ef6ec2ca21c 100644 --- a/drivers/firewire/fw-device.h +++ b/drivers/firewire/fw-device.h | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | enum fw_device_state { | 28 | enum fw_device_state { |
| 29 | FW_DEVICE_INITIALIZING, | 29 | FW_DEVICE_INITIALIZING, |
| 30 | FW_DEVICE_RUNNING, | 30 | FW_DEVICE_RUNNING, |
| 31 | FW_DEVICE_GONE, | ||
| 31 | FW_DEVICE_SHUTDOWN, | 32 | FW_DEVICE_SHUTDOWN, |
| 32 | }; | 33 | }; |
| 33 | 34 | ||