commit d3aea469aff6091b0723a9c9be89bd076d1eaddc
author Jian Ho <jianho@google.com> Tue Mar 17 18:19:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 17 18:19:49 2015 +0000
tree 4b576c273f915ca878e4ca524a53878869d0eddf
parent 27f617267d7fa782000db550245ae8a8ce86cc75
parent 72a25835d04ced298697cab4ad6beebd7b0c7dc4

Merge "Back port Marvell 88E1510/12 PHY driver to SpaceCast"

arch/arm/configs/gfrg200_defconfig

diff --git a/arch/arm/configs/gfrg200_defconfig b/arch/arm/configs/gfrg200_defconfig
index b9b0654..983573c 100644
--- a/arch/arm/configs/gfrg200_defconfig
+++ b/arch/arm/configs/gfrg200_defconfig
@@ -24,7 +24,6 @@
 CONFIG_OPROFILE=m
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_COMCERTO=y
 CONFIG_GOOGLE_FIBER_OPTIMUS=y

arch/arm/configs/gfsc100_defconfig

diff --git a/arch/arm/configs/gfsc100_defconfig b/arch/arm/configs/gfsc100_defconfig
index 349240b..e1ac049 100644
--- a/arch/arm/configs/gfsc100_defconfig
+++ b/arch/arm/configs/gfsc100_defconfig
@@ -260,7 +260,6 @@
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_PARTITION_ADVANCED=y
-CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y