projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
mips
/
configs
/
ip22_defconfig
diff --git
a/arch/mips/configs/ip22_defconfig
b/arch/mips/configs/ip22_defconfig
index
cc8e6bf
..
f719bf5
100644
(file)
--- a/
arch/mips/configs/ip22_defconfig
+++ b/
arch/mips/configs/ip22_defconfig
@@
-771,7
+771,6
@@
CONFIG_WATCHDOG=y
CONFIG_INDYDOG=m
# CONFIG_HW_RANDOM is not set
# CONFIG_RTC is not set
-CONFIG_SGI_DS1286=m
# CONFIG_R3964 is not set
CONFIG_RAW_DRIVER=m
CONFIG_MAX_RAW_DEVS=256