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 git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
44x
/
icon_defconfig
diff --git
a/arch/powerpc/configs/44x/icon_defconfig
b/arch/powerpc/configs/44x/icon_defconfig
index 4453a4590b1a02beec353a99557f4b1e42b2016c..fa5378af44f90a29fe4cb49dd23afec219129150 100644
(file)
--- a/
arch/powerpc/configs/44x/icon_defconfig
+++ b/
arch/powerpc/configs/44x/icon_defconfig
@@
-24,7
+24,6
@@
CONFIG_IP_PNP_BOOTP=y
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_CONNECTOR=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y