summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-31 22:23:02 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-05-31 23:04:35 -0400
commit940afcbf92efc16c6b932d35041dd8ef5251ae55 (patch)
treefd8070ff6a060d0de1e40f1dc7628ddee38f63e5 /config-generic
parent7452d27e96b9986a5e20b87e70fc84b58f394f81 (diff)
downloadkernel-940afcbf92efc16c6b932d35041dd8ef5251ae55.tar.gz
kernel-940afcbf92efc16c6b932d35041dd8ef5251ae55.tar.xz
kernel-940afcbf92efc16c6b932d35041dd8ef5251ae55.zip
Linux v3.4-9547-gfb21aff
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic14
1 files changed, 13 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 8569c9a26..ef4e4afce 100644
--- a/config-generic
+++ b/config-generic
@@ -417,6 +417,7 @@ CONFIG_SCSI_DC395x=m
CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_DC390T=m
CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_DPT_I2O is not set
@@ -3630,6 +3631,17 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_CODEPAGE_MACROMAN=m
+CONFIG_NLS_CODEPAGE_MACCELTIC=m
+CONFIG_NLS_CODEPAGE_MACCENTEURO=m
+CONFIG_NLS_CODEPAGE_MACCROATIAN=m
+CONFIG_NLS_CODEPAGE_MACCYRILLIC=m
+CONFIG_NLS_CODEPAGE_MACGAELIC=m
+CONFIG_NLS_CODEPAGE_MACGREEK=m
+CONFIG_NLS_CODEPAGE_MACICELAND=m
+CONFIG_NLS_CODEPAGE_MACINUIT=m
+CONFIG_NLS_CODEPAGE_MACROMANIAN=m
+CONFIG_NLS_CODEPAGE_MACTURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS_ASCII=y
@@ -4041,7 +4053,7 @@ CONFIG_CFAG12864B_RATE=20
# CONFIG_PHANTOM is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_TEST_POWER is not set