git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
Kconfig
diff --git
a/arch/alpha/Kconfig
b/arch/alpha/Kconfig
index 8629127640cff0779bdaebd87d4fadd32799e04e..837a1f2d8b965a60b61252521f21129be9e80afe 100644
(file)
--- a/
arch/alpha/Kconfig
+++ b/
arch/alpha/Kconfig
@@
-55,9
+55,6
@@
config GENERIC_CALIBRATE_DELAY
bool
default y
-config GENERIC_GPIO
- bool
-
config ZONE_DMA
bool
default y