diff options
| author | zhxihu <zhxihu@marvell.com> | 2015-11-04 15:24:52 -0800 |
|---|---|---|
| committer | Mohammed Habibulla <moch@google.com> | 2015-11-05 15:17:34 -0800 |
| commit | 64aef4c79766fe91262e07a7bb7d70b6a93827b0 (patch) | |
| tree | 470a472c85a715222d5ea848e1a799dfa4402ed0 | |
| parent | 6cb74b2108796d8f241a0784caad8b4a0d27750c (diff) | |
| download | marvell-64aef4c79766fe91262e07a7bb7d70b6a93827b0.tar.gz | |
Kenrel: Remove useless configurations of network interface.
BUG=25486837
Change-Id: I358f678c0d1fc8974ac7a84c5ef2aab75d60baeb
| -rw-r--r-- | arch/arm/configs/armadillo_edge_defconfig | 29 | ||||
| -rw-r--r-- | drivers/mfd/88pm88x-i2c.c | 2 |
2 files changed, 6 insertions, 25 deletions
diff --git a/arch/arm/configs/armadillo_edge_defconfig b/arch/arm/configs/armadillo_edge_defconfig index 5258a36871a..45f18496678 100644 --- a/arch/arm/configs/armadillo_edge_defconfig +++ b/arch/arm/configs/armadillo_edge_defconfig @@ -643,7 +643,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set -CONFIG_NET_IP_TUNNEL=y +# CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set CONFIG_SYN_COOKIES=y # CONFIG_NET_IPVTI is not set @@ -651,7 +651,7 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_ESP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=y +# CONFIG_INET_TUNNEL is not set CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y @@ -667,27 +667,6 @@ CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_INET6_XFRM_TUNNEL=y -CONFIG_INET6_TUNNEL=y -CONFIG_INET6_XFRM_MODE_TRANSPORT=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y -CONFIG_INET6_XFRM_MODE_BEET=y -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y -CONFIG_IPV6_VTI=y -CONFIG_IPV6_SIT=y -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_GRE=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_IPV6_PIMSM_V2=y # CONFIG_NETLABEL is not set CONFIG_ANDROID_PARANOID_NETWORK=y CONFIG_NET_ACTIVITY_STATS=y @@ -3131,9 +3110,9 @@ CONFIG_MRVL_PANIC_FLUSH=y CONFIG_MRVL_SKMALLOC=y CONFIG_SKMALLOC_REBOOT_NOTIFY=y CONFIG_MRVL_SKMALLOC_WIRELESS_EN=y -CONFIG_MRVL_MMP_MODEM=y +# CONFIG_MRVL_MMP_MODEM is not set # CONFIG_SSIPC_SUPPORT is not set -CONFIG_MRVL_MMP_CM3=y +# CONFIG_MRVL_MMP_CM3 is not set CONFIG_MRVL_RSV_PAGE=y # diff --git a/drivers/mfd/88pm88x-i2c.c b/drivers/mfd/88pm88x-i2c.c index b6f8c4657de..598f29d7052 100644 --- a/drivers/mfd/88pm88x-i2c.c +++ b/drivers/mfd/88pm88x-i2c.c @@ -127,6 +127,7 @@ static int pm88x_i2c_suspend(struct device *dev) struct regulator *buck1slp; int fuse_slpvolt = 0; +#ifdef CONFIG_MRVL_MMP_CM3 if (!buck1slp_is_ever_changed) { pr_info("%s: buck1_sleep is not being used by other modules.\n", __func__); @@ -149,6 +150,7 @@ static int pm88x_i2c_suspend(struct device *dev) } else { pr_info("%s: buck1_sleep is being used by other modules.\n", __func__); } +#endif return 0; } |