diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:16:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:16:51 -0400 |
commit | d02859ecb321c8c0f74cb9bbe3f51a59e58822b0 (patch) | |
tree | 05dd5bdc55081c0a90bf0afc35c07d0d6e25d015 /drivers/firewire/Kconfig | |
parent | a987b16cc6123af2c9414032701bab5f73c54c89 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge commit 'v2.6.26-rc8' into x86/xen
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/firewire/Kconfig')
-rw-r--r-- | drivers/firewire/Kconfig | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index fb4d391810b6..76f26710fc16 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig | |||
@@ -1,28 +1,26 @@ | |||
1 | comment "An alternative FireWire stack is available with EXPERIMENTAL=y" | 1 | comment "A new alternative FireWire stack is available with EXPERIMENTAL=y" |
2 | depends on EXPERIMENTAL=n | 2 | depends on EXPERIMENTAL=n |
3 | 3 | ||
4 | comment "Enable only one of the two stacks, unless you know what you are doing" | ||
5 | depends on EXPERIMENTAL | ||
6 | |||
4 | config FIREWIRE | 7 | config FIREWIRE |
5 | tristate "IEEE 1394 (FireWire) support - alternative stack, EXPERIMENTAL" | 8 | tristate "New FireWire stack, EXPERIMENTAL" |
6 | depends on EXPERIMENTAL | 9 | depends on EXPERIMENTAL |
7 | select CRC_ITU_T | 10 | select CRC_ITU_T |
8 | help | 11 | help |
9 | This is the "Juju" FireWire stack, a new alternative implementation | 12 | This is the "Juju" FireWire stack, a new alternative implementation |
10 | designed for robustness and simplicity. You can build either this | 13 | designed for robustness and simplicity. You can build either this |
11 | stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) | 14 | stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both. |
12 | or both. Please read http://wiki.linux1394.org/JujuMigration before | 15 | Please read http://wiki.linux1394.org/JujuMigration before you |
13 | you enable the new stack. | 16 | enable the new stack. |
14 | 17 | ||
15 | To compile this driver as a module, say M here: the module will be | 18 | To compile this driver as a module, say M here: the module will be |
16 | called firewire-core. It functionally replaces ieee1394, raw1394, | 19 | called firewire-core. It functionally replaces ieee1394, raw1394, |
17 | and video1394. | 20 | and video1394. |
18 | 21 | ||
19 | NOTE: | ||
20 | |||
21 | You should only build ONE of the stacks, unless you REALLY know what | ||
22 | you are doing. | ||
23 | |||
24 | config FIREWIRE_OHCI | 22 | config FIREWIRE_OHCI |
25 | tristate "Support for OHCI FireWire host controllers" | 23 | tristate "OHCI-1394 controllers" |
26 | depends on PCI && FIREWIRE | 24 | depends on PCI && FIREWIRE |
27 | help | 25 | help |
28 | Enable this driver if you have a FireWire controller based | 26 | Enable this driver if you have a FireWire controller based |
@@ -33,12 +31,12 @@ config FIREWIRE_OHCI | |||
33 | called firewire-ohci. It replaces ohci1394 of the classic IEEE 1394 | 31 | called firewire-ohci. It replaces ohci1394 of the classic IEEE 1394 |
34 | stack. | 32 | stack. |
35 | 33 | ||
36 | NOTE: | 34 | NOTE: |
37 | 35 | ||
38 | You should only build ohci1394 or firewire-ohci, but not both. | 36 | You should only build either firewire-ohci or the old ohci1394 driver, |
39 | If you nevertheless want to install both, you should configure them | 37 | but not both. If you nevertheless want to install both, you should |
40 | only as modules and blacklist the driver(s) which you don't want to | 38 | configure them only as modules and blacklist the driver(s) which you |
41 | have auto-loaded. Add either | 39 | don't want to have auto-loaded. Add either |
42 | 40 | ||
43 | blacklist firewire-ohci | 41 | blacklist firewire-ohci |
44 | or | 42 | or |
@@ -60,7 +58,7 @@ config FIREWIRE_OHCI_DEBUG | |||
60 | default y | 58 | default y |
61 | 59 | ||
62 | config FIREWIRE_SBP2 | 60 | config FIREWIRE_SBP2 |
63 | tristate "Support for storage devices (SBP-2 protocol driver)" | 61 | tristate "Storage devices (SBP-2 protocol)" |
64 | depends on FIREWIRE && SCSI | 62 | depends on FIREWIRE && SCSI |
65 | help | 63 | help |
66 | This option enables you to use SBP-2 devices connected to a | 64 | This option enables you to use SBP-2 devices connected to a |