projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[linux-block.git]
/
arch
/
powerpc
/
configs
/
ppc6xx_defconfig
diff --git
a/arch/powerpc/configs/ppc6xx_defconfig
b/arch/powerpc/configs/ppc6xx_defconfig
index adc314049fdd80c5827c0b2816ac500bb8664249..ff3d790835813b18aed460f560cc14aa91564335 100644
(file)
--- a/
arch/powerpc/configs/ppc6xx_defconfig
+++ b/
arch/powerpc/configs/ppc6xx_defconfig
@@
-614,8
+614,6
@@
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_NVRAM=y
CONFIG_DTLK=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
CONFIG_IPWIRELESS=m
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_HYDRA=m