git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
Kconfig
diff --git
a/drivers/net/irda/Kconfig
b/drivers/net/irda/Kconfig
index
a40fab4
..
d423d18
100644
(file)
--- a/
drivers/net/irda/Kconfig
+++ b/
drivers/net/irda/Kconfig
@@
-314,7
+314,7
@@
config TOSHIBA_FIR
config AU1000_FIR
tristate "Alchemy Au1000 SIR/FIR"
- depends on
SOC_AU1000 && IRDA
+ depends on
IRDA && MIPS_ALCHEMY
config SMC_IRCC_FIR
tristate "SMSC IrCC (EXPERIMENTAL)"