diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/ata/Kconfig | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 3b54e6e60635..78fbec8ceda0 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -662,7 +662,7 @@ config HAVE_PATA_PLATFORM | |||
| 662 | 662 | ||
| 663 | config PATA_PLATFORM | 663 | config PATA_PLATFORM |
| 664 | tristate "Generic platform device PATA support" | 664 | tristate "Generic platform device PATA support" |
| 665 | depends on EMBEDDED || ARCH_RPC || PPC || HAVE_PATA_PLATFORM | 665 | depends on EMBEDDED || PPC || HAVE_PATA_PLATFORM |
| 666 | help | 666 | help |
| 667 | This option enables support for generic directly connected ATA | 667 | This option enables support for generic directly connected ATA |
| 668 | devices commonly found on embedded systems. | 668 | devices commonly found on embedded systems. |