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 branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
common
/
Kconfig
diff --git
a/arch/arm/common/Kconfig
b/arch/arm/common/Kconfig
index 9353184d730dfda864c85ec180b906b9ed575681..1181053e3ade766fd0ad5364831920b97d5632a5 100644
(file)
--- a/
arch/arm/common/Kconfig
+++ b/
arch/arm/common/Kconfig
@@
-1,6
+1,3
@@
-config ICST
- bool
-
config SA1111
bool
select DMABOUNCE if !ARCH_PXA