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 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
Kconfig
diff --git
a/arch/cris/arch-v32/drivers/Kconfig
b/arch/cris/arch-v32/drivers/Kconfig
index
f64779c
..
acff3df
100644
(file)
--- a/
arch/cris/arch-v32/drivers/Kconfig
+++ b/
arch/cris/arch-v32/drivers/Kconfig
@@
-617,7
+617,6
@@
config ETRAX_PV_CHANGEABLE_BITS
config ETRAX_CARDBUS
bool "Cardbus support"
depends on ETRAX_ARCH_V32
- select HOTPLUG
help
Enabled the ETRAX Cardbus driver.