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 branch 'for-5.4/wacom' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
acs5k_defconfig
diff --git
a/arch/arm/configs/acs5k_defconfig
b/arch/arm/configs/acs5k_defconfig
index d04ee19e5b751e7dd4649425ccbc9cdc8ea1ed5e..bcb8bda09158cc398439118e04027359de9cb982 100644
(file)
--- a/
arch/arm/configs/acs5k_defconfig
+++ b/
arch/arm/configs/acs5k_defconfig
@@
-30,7
+30,6
@@
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y