[PATCH 12/12] UBUNTU: [Config] Enable AHCI_XGENE and PHY_XGENE for arm64

[Ike Panhc]

GENERIC_PHY and SATA_AHCI_PLATFORM also become build-in because of dependency

BugLink: http://launchpad.net/bugs/1282920

Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
 debian.master/config/arm64/config.common.arm64 |    4 ++--
 debian.master/config/config.common.ubuntu      |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 4860e98..dff768f 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -67,7 +67,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FRAME_WARN=1024
 CONFIG_FSL_FMAN=y
 CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_PHY=m
+CONFIG_GENERIC_PHY=y
 CONFIG_GPIO_GENERIC=m
 # CONFIG_GPIO_TWL6040 is not set
 CONFIG_HAMRADIO=y
@@ -165,7 +165,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_RFKILL=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PL031=m
-CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SATA_HIGHBANK is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCSI_DH_EMC=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8dc8f08..07889c9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -176,6 +176,7 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_UNINORTH=m
 CONFIG_AGP_VIA=y
+CONFIG_AHCI_XGENE=y
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
@@ -4756,6 +4757,7 @@ CONFIG_PHANTOM=m
 CONFIG_PHONET=m
 CONFIG_PHYLIB=y
 CONFIG_PHYS_64BIT=y
+CONFIG_PHY_XGENE=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
-- 
1.7.9.5