diff options
| author | Andi Kleen <ak@suse.de> | 2007-10-29 17:37:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 11:06:55 -0400 |
| commit | 4138f08d1c2783a28df2af6ed81aa180462ec374 (patch) | |
| tree | 11b9d3b4cbafe4c9d1dd7c9b7ef934dee2bafdb4 | |
| parent | bc2a3f86f46569fb091792867ce67c9ab24dfd0f (diff) | |
Remove bogus default y for DMAR and NET_DMA
No reason I can think of of making them default y Most people don't have
the hardware and with default y they just pollute lots of configs during
make oldconfig.
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Jeff Garzik <jeff@garzik.org>
Acked-by: "Nelson, Shannon" <shannon.nelson@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/x86/Kconfig.x86_64 | 1 | ||||
| -rw-r--r-- | drivers/dma/Kconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64 index b45855c368a9..cc468ea61240 100644 --- a/arch/x86/Kconfig.x86_64 +++ b/arch/x86/Kconfig.x86_64 | |||
| @@ -749,7 +749,6 @@ config PCI_DOMAINS | |||
| 749 | config DMAR | 749 | config DMAR |
| 750 | bool "Support for DMA Remapping Devices (EXPERIMENTAL)" | 750 | bool "Support for DMA Remapping Devices (EXPERIMENTAL)" |
| 751 | depends on PCI_MSI && ACPI && EXPERIMENTAL | 751 | depends on PCI_MSI && ACPI && EXPERIMENTAL |
| 752 | default y | ||
| 753 | help | 752 | help |
| 754 | DMA remapping (DMAR) devices support enables independent address | 753 | DMA remapping (DMAR) devices support enables independent address |
| 755 | translations for Direct Memory Access (DMA) from devices. | 754 | translations for Direct Memory Access (DMA) from devices. |
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 9c91b0fd134f..6a7d25fc2470 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -43,7 +43,6 @@ comment "DMA Clients" | |||
| 43 | config NET_DMA | 43 | config NET_DMA |
| 44 | bool "Network: TCP receive copy offload" | 44 | bool "Network: TCP receive copy offload" |
| 45 | depends on DMA_ENGINE && NET | 45 | depends on DMA_ENGINE && NET |
| 46 | default y | ||
| 47 | help | 46 | help |
| 48 | This enables the use of DMA engines in the network stack to | 47 | This enables the use of DMA engines in the network stack to |
| 49 | offload receive copy-to-user operations, freeing CPU cycles. | 48 | offload receive copy-to-user operations, freeing CPU cycles. |
