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 'linus' into core/softlockup
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
badge4_defconfig
diff --git
a/arch/arm/configs/badge4_defconfig
b/arch/arm/configs/badge4_defconfig
index
821865f
..
b2bbf21
100644
(file)
--- a/
arch/arm/configs/badge4_defconfig
+++ b/
arch/arm/configs/badge4_defconfig
@@
-708,7
+708,6
@@
CONFIG_I2C_ALGOPCF=m
# I2C Hardware Bus support
#
CONFIG_I2C_ELEKTOR=m
-# CONFIG_I2C_ISA is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_STUB is not set