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 tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
pmac32_defconfig
diff --git
a/arch/powerpc/configs/pmac32_defconfig
b/arch/powerpc/configs/pmac32_defconfig
index 88d5b4935732dbc42353869d7f90895adc01ee8a..e5a674d4a716db7fa4489d9dcb6ba12bcff94e11 100644
(file)
--- a/
arch/powerpc/configs/pmac32_defconfig
+++ b/
arch/powerpc/configs/pmac32_defconfig
@@
-157,7
+157,7
@@
CONFIG_ADB=y
CONFIG_ADB_CUDA=y
CONFIG_ADB_PMU=y
CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_
IDE
=y
+CONFIG_ADB_PMU_LED_
DISK
=y
CONFIG_PMAC_APM_EMU=m
CONFIG_PMAC_MEDIABAY=y
CONFIG_PMAC_BACKLIGHT=y