projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-block.git]
/
drivers
/
spi
/
Kconfig
diff --git
a/drivers/spi/Kconfig
b/drivers/spi/Kconfig
index 10f99f45a29bc8a567126e5739cd4f36ac5a9cca..89cbbabaff44c66771efc3f26b18e9b4565a4cc3 100644
(file)
--- a/
drivers/spi/Kconfig
+++ b/
drivers/spi/Kconfig
@@
-266,7
+266,7
@@
config SPI_OC_TINY
config SPI_OCTEON
tristate "Cavium OCTEON SPI controller"
- depends on C
PU_CAVIUM_OCTEON
+ depends on C
AVIUM_OCTEON_SOC
help
SPI host driver for the hardware found on some Cavium OCTEON
SOCs.