UBUNTU: [Config] CONFIG_GOLDFISH=n

BugLink: http://bugs.launchpad.net/bugs/1627052
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 61569f7f4b77ac1953cc944cd83633a3a6ead856..fd5c61c10b8d8cffc6cc66b02021e2ad5e13007c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -830,7 +830,6 @@ CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2781=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
 CONFIG_BATTERY_INTEL_MID=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
@@ -2494,7 +2493,6 @@ CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
 CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GOLDFISH=m
 CONFIG_FB_HECUBA=m
 CONFIG_FB_HGA=m
 CONFIG_FB_HYPERV=m
@@ -2823,11 +2821,7 @@ CONFIG_GIGASET_M105=m
 CONFIG_GIRBIL_DONGLE=m
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
-CONFIG_GOLDFISH=y
-CONFIG_GOLDFISH_AUDIO=m
-CONFIG_GOLDFISH_BUS=y
-CONFIG_GOLDFISH_PIPE=m
-CONFIG_GOLDFISH_TTY=m
+# CONFIG_GOLDFISH is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_GP2AP020A00F=m
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -4105,7 +4099,6 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_BCM=m
 CONFIG_KEYBOARD_CAP11XX=m
 CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_KEYBOARD_GOLDFISH_EVENTS=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_IMX=m
@@ -4722,7 +4715,6 @@ CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC_GOLDFISH=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_MXC=m
@@ -4891,7 +4883,6 @@ CONFIG_MTD_DATAFLASH_OTP=y
 CONFIG_MTD_DOCG3=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_GOLDFISH_NAND=m
 CONFIG_MTD_GPIO_ADDR=m
 CONFIG_MTD_ICHXROM=m
 CONFIG_MTD_IMPA7=m