projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' (accumulated 3.16 merge window patches) into master
[cascardo/linux.git]
/
drivers
/
ata
/
Kconfig
diff --git
a/drivers/ata/Kconfig
b/drivers/ata/Kconfig
index
c270604
..
0033faf
100644
(file)
--- a/
drivers/ata/Kconfig
+++ b/
drivers/ata/Kconfig
@@
-815,7
+815,7
@@
config PATA_AT32
config PATA_AT91
tristate "PATA support for AT91SAM9260"
- depends on ARM &&
ARCH_AT91
+ depends on ARM &&
SOC_AT91SAM9
help
This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.