diff options
author | Andy Whitcroft <apw@canonical.com> | 2012-05-31 11:54:27 +0100 |
---|---|---|
committer | Andy Whitcroft <apw@canonical.com> | 2012-05-31 11:54:27 +0100 |
commit | 1c2bb275d8cc220aa5d6a9ed1a711b93c6363cb6 (patch) | |
tree | 92689188f1a71b9a33ca4a20d58b9f3cc77b229b /debian.master | |
parent | 6e6a7c1f92ff56f5b0de59144dd2b4b93b2ed4b4 (diff) |
UBUNTU: [Config] CONFIG_SM_FTL=m commonise
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
-rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
-rw-r--r-- | debian.master/config/armhf/config.common.armhf | 1 | ||||
-rw-r--r-- | debian.master/config/config.common.ubuntu | 3 | ||||
-rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
-rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
-rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
7 files changed, 2 insertions, 7 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index c11518d84ef..4a1d172209a 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -121,7 +121,6 @@ CONFIG_SCSI_SPI_ATTRS=y CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SM_FTL=m # CONFIG_SND_BT87X_OVERCLOCK is not set CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index e296eeb13c0..f5e667007de 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -100,7 +100,6 @@ CONFIG_SCHEDSTATS=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y -CONFIG_SM_FTL=m # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_OPL3_LIB_SEQ is not set # CONFIG_SND_OPL4_LIB_SEQ is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 780dd2644f5..be264bce2a4 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -100,7 +100,6 @@ CONFIG_SCHEDSTATS=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y -CONFIG_SM_FTL=m # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_OPL3_LIB_SEQ is not set # CONFIG_SND_OPL4_LIB_SEQ is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 0de31c50dfc..950d6a5a9bd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4949,7 +4949,7 @@ CONFIG_SERIAL_AMBA_PL010=m CONFIG_SERIAL_AMBA_PL011=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_ICOM is not set +CONFIG_SERIAL_ICOM=m # CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_JSM=m CONFIG_SERIAL_MAX3100=m @@ -5029,6 +5029,7 @@ CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMS_SDIO_DRV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_USB_DRV=m +CONFIG_SM_FTL=m CONFIG_SND=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_AC97_POWER_SAVE=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index c6c4fd84f5a..3c9a0189aa7 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -121,7 +121,6 @@ CONFIG_SCSI_SPI_ATTRS=y CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SM_FTL=m # CONFIG_SND_BT87X_OVERCLOCK is not set CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 2ce99b6aead..1e4118f8abf 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -111,7 +111,6 @@ CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SERIAL_8250=m CONFIG_SERIAL_8250_PCI=m -# CONFIG_SM_FTL is not set CONFIG_SND_BT87X_OVERCLOCK=y CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 01537558895..9aff6102d29 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -145,7 +145,6 @@ CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SERIAL_8250=m CONFIG_SERIAL_8250_PCI=m -# CONFIG_SM_FTL is not set CONFIG_SND_BT87X_OVERCLOCK=y CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m |