summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-06-02 07:56:45 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-06-02 10:44:50 -0400
commitd0633aed96aaed8d8996ecec7213ad2bf1a819df (patch)
tree189362ac06dd65b48299416667e7965c75152330 /config-generic
parent940afcbf92efc16c6b932d35041dd8ef5251ae55 (diff)
downloadkernel-d0633aed96aaed8d8996ecec7213ad2bf1a819df.tar.gz
kernel-d0633aed96aaed8d8996ecec7213ad2bf1a819df.tar.xz
kernel-d0633aed96aaed8d8996ecec7213ad2bf1a819df.zip
Linux v3.4-10115-g829f51d
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic23
1 files changed, 12 insertions, 11 deletions
diff --git a/config-generic b/config-generic
index ef4e4afce..7fb1d4a6a 100644
--- a/config-generic
+++ b/config-generic
@@ -2662,6 +2662,7 @@ CONFIG_FB=y
# CONFIG_FB_ATY_CT is not set
# CONFIG_FB_ATY_GX is not set
# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_AUO_K190X is not set
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
@@ -3631,17 +3632,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_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS_ASCII=y