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 master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
parisc
/
Kconfig
diff --git
a/arch/parisc/Kconfig
b/arch/parisc/Kconfig
index
0f9ff61
..
28da4e7
100644
(file)
--- a/
arch/parisc/Kconfig
+++ b/
arch/parisc/Kconfig
@@
-50,9
+50,6
@@
config TIME_LOW_RES
depends on SMP
default y
-config GENERIC_ISA_DMA
- bool
-
config GENERIC_HARDIRQS
def_bool y