diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-04-01 10:13:41 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-07-25 14:37:30 -0600 |
| commit | 4b05ab00acd4c3683c692d7acf952f964ccf3a1f (patch) | |
| tree | 7149213d484157d47e99cc193bb9ccc2dee3db3d /debian.master/config/powerpc/config.common.powerpc | |
| parent | b9bcff0b60e30c19928161a0fbfc7cfba08e885e (diff) | |
UBUNTU: [Config] updateconfigs following rebase to v2.6.39-rc1
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master/config/powerpc/config.common.powerpc')
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 5eac7ee7ebb..11ef9acbd86 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -21,6 +21,7 @@ CONFIG_AUDIT_ARCH=y CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_B44=m +CONFIG_BCH=m # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_SD=m @@ -120,6 +121,7 @@ CONFIG_I2C_ALGOBIT=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_I801=m # CONFIG_I2C_PASEMI is not set +# CONFIG_I2C_PXA_PCI is not set # CONFIG_IBMEBUS is not set # CONFIG_IBMVETH is not set # CONFIG_IBM_BSR is not set @@ -193,7 +195,6 @@ CONFIG_MTD_CFI_STAA=m CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_CHAR=m CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_CONCAT=m CONFIG_MTD_DATAFLASH=m CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m @@ -203,6 +204,7 @@ CONFIG_MTD_GPIO_ADDR=m CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_MTDRAM=m CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_NAND_NANDSIM=m @@ -258,7 +260,7 @@ CONFIG_PSERIES_ENERGY=m CONFIG_QSEMI_PHY=m CONFIG_R3964=m # CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_RFD_FTL=m CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set |