diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /drivers/firewire/fw-device.h | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
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 | ||