summaryrefslogtreecommitdiffstats
path: root/meta-moblin/packages/linux
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-31 22:14:32 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-31 22:14:32 +0100
commit2f6ad802da79b411baf9e519758c43b2eaea8051 (patch)
tree9ca31204f8da9860a017efecfd7fb4b0fa7bd2b2 /meta-moblin/packages/linux
parent8df390e179be8c0a774950b2377de5343ae10ff0 (diff)
downloadpoky-2f6ad802da79b411baf9e519758c43b2eaea8051.tar.gz
linux-moblin: Update menlow defconfig
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin/packages/linux')
-rw-r--r--meta-moblin/packages/linux/linux-moblin-2.6.29.1/defconfig-menlow13
1 files changed, 10 insertions, 3 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.29.1/defconfig-menlow b/meta-moblin/packages/linux/linux-moblin-2.6.29.1/defconfig-menlow
index ec7e1d66ea..0b0bfd7e6e 100644
--- a/meta-moblin/packages/linux/linux-moblin-2.6.29.1/defconfig-menlow
+++ b/meta-moblin/packages/linux/linux-moblin-2.6.29.1/defconfig-menlow
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc8 3# Linux kernel version: 2.6.29.1
4# Wed Apr 1 13:38:03 2009 4# Fri May 29 15:05:21 2009
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -847,6 +847,7 @@ CONFIG_LIB80211=m
847CONFIG_LIB80211_CRYPT_WEP=m 847CONFIG_LIB80211_CRYPT_WEP=m
848CONFIG_LIB80211_CRYPT_CCMP=m 848CONFIG_LIB80211_CRYPT_CCMP=m
849CONFIG_LIB80211_CRYPT_TKIP=m 849CONFIG_LIB80211_CRYPT_TKIP=m
850# CONFIG_LIB80211_DEBUG is not set
850# CONFIG_MAC80211 is not set 851# CONFIG_MAC80211 is not set
851# CONFIG_WIMAX is not set 852# CONFIG_WIMAX is not set
852# CONFIG_RFKILL is not set 853# CONFIG_RFKILL is not set
@@ -1301,6 +1302,7 @@ CONFIG_ULTRA=m
1301CONFIG_SMC9194=m 1302CONFIG_SMC9194=m
1302# CONFIG_ENC28J60 is not set 1303# CONFIG_ENC28J60 is not set
1303# CONFIG_NET_VENDOR_RACAL is not set 1304# CONFIG_NET_VENDOR_RACAL is not set
1305# CONFIG_DNET is not set
1304CONFIG_NET_TULIP=y 1306CONFIG_NET_TULIP=y
1305CONFIG_DE2104X=m 1307CONFIG_DE2104X=m
1306CONFIG_TULIP=m 1308CONFIG_TULIP=m
@@ -1393,6 +1395,7 @@ CONFIG_IXGB=m
1393# CONFIG_BNX2X is not set 1395# CONFIG_BNX2X is not set
1394# CONFIG_QLGE is not set 1396# CONFIG_QLGE is not set
1395# CONFIG_SFC is not set 1397# CONFIG_SFC is not set
1398# CONFIG_BE2NET is not set
1396# CONFIG_TR is not set 1399# CONFIG_TR is not set
1397 1400
1398# 1401#
@@ -1578,6 +1581,7 @@ CONFIG_TOUCHSCREEN_MK712=m
1578# CONFIG_TOUCHSCREEN_WM97XX is not set 1581# CONFIG_TOUCHSCREEN_WM97XX is not set
1579# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set 1582# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
1580# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set 1583# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
1584# CONFIG_TOUCHSCREEN_TSC2003 is not set
1581# CONFIG_TOUCHSCREEN_TSC2007 is not set 1585# CONFIG_TOUCHSCREEN_TSC2007 is not set
1582CONFIG_INPUT_MISC=y 1586CONFIG_INPUT_MISC=y
1583CONFIG_INPUT_PCSPKR=y 1587CONFIG_INPUT_PCSPKR=y
@@ -1770,6 +1774,7 @@ CONFIG_SPI_MASTER=y
1770# SPI Master Controller Drivers 1774# SPI Master Controller Drivers
1771# 1775#
1772CONFIG_SPI_BITBANG=m 1776CONFIG_SPI_BITBANG=m
1777# CONFIG_SPI_XILINX is not set
1773 1778
1774# 1779#
1775# SPI Protocol Masters 1780# SPI Protocol Masters
@@ -1897,6 +1902,7 @@ CONFIG_SSB_POSSIBLE=y
1897# CONFIG_MFD_WM8400 is not set 1902# CONFIG_MFD_WM8400 is not set
1898# CONFIG_MFD_WM8350_I2C is not set 1903# CONFIG_MFD_WM8350_I2C is not set
1899# CONFIG_MFD_PCF50633 is not set 1904# CONFIG_MFD_PCF50633 is not set
1905# CONFIG_MFD_TIMBERDALE is not set
1900# CONFIG_REGULATOR is not set 1906# CONFIG_REGULATOR is not set
1901 1907
1902# 1908#
@@ -2204,7 +2210,6 @@ CONFIG_DRM=m
2204# CONFIG_DRM_TDFX is not set 2210# CONFIG_DRM_TDFX is not set
2205# CONFIG_DRM_R128 is not set 2211# CONFIG_DRM_R128 is not set
2206# CONFIG_DRM_RADEON is not set 2212# CONFIG_DRM_RADEON is not set
2207CONFIG_DRM_INTEL_COMMON=m
2208# CONFIG_DRM_I810 is not set 2213# CONFIG_DRM_I810 is not set
2209# CONFIG_DRM_I830 is not set 2214# CONFIG_DRM_I830 is not set
2210CONFIG_DRM_I915=m 2215CONFIG_DRM_I915=m
@@ -2213,6 +2218,7 @@ CONFIG_DRM_I915_KMS=y
2213# CONFIG_DRM_SIS is not set 2218# CONFIG_DRM_SIS is not set
2214# CONFIG_DRM_VIA is not set 2219# CONFIG_DRM_VIA is not set
2215# CONFIG_DRM_SAVAGE is not set 2220# CONFIG_DRM_SAVAGE is not set
2221CONFIG_DRM_PSB=m
2216CONFIG_VGASTATE=m 2222CONFIG_VGASTATE=m
2217CONFIG_VIDEO_OUTPUT_CONTROL=y 2223CONFIG_VIDEO_OUTPUT_CONTROL=y
2218CONFIG_FB=y 2224CONFIG_FB=y
@@ -2746,6 +2752,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
2746# 2752#
2747CONFIG_MMC_SDHCI=y 2753CONFIG_MMC_SDHCI=y
2748# CONFIG_MMC_SDHCI_PCI is not set 2754# CONFIG_MMC_SDHCI_PCI is not set
2755# CONFIG_MMC_SDHCI_PLTFM is not set
2749# CONFIG_MMC_WBSD is not set 2756# CONFIG_MMC_WBSD is not set
2750# CONFIG_MMC_TIFM_SD is not set 2757# CONFIG_MMC_TIFM_SD is not set
2751# CONFIG_MEMSTICK is not set 2758# CONFIG_MEMSTICK is not set