summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/magician
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-05-17 15:24:36 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-05-17 15:24:36 +0000
commit6c5fda9795cfa099293cc22a552fcf593d132816 (patch)
treed8e0d1b6d051bce6324f5e74582c4fceaeee01f8 /packages/linux/linux-handhelds-2.6/magician
parentf537bc270524b78d0eb5ced77d07eef652d91baf (diff)
parent1bc70eb69104152c43c44ffb5987ae83f7dafb1d (diff)
merge of 'e41a7519b0ab5d7de23e01a67be1fee207a88b76'
and 'e97f7fcb1a8a20872c5ea4de757e3bff33a398fa'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/magician')
-rw-r--r--packages/linux/linux-handhelds-2.6/magician/defconfig26
1 files changed, 19 insertions, 7 deletions
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index f28619ae08..3d25d76f83 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh2
-# Sat May 12 20:38:59 2007
+# Thu May 17 14:41:37 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -674,7 +674,8 @@ CONFIG_INPUT_MOUSE=y
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
@@ -772,10 +773,10 @@ CONFIG_W1_DS2760=y
#
CONFIG_EXTERNAL_POWER=y
CONFIG_BATTERY=y
-# CONFIG_PDA_POWER is not set
+CONFIG_PDA_POWER=y
CONFIG_DS2760_BATTERY=y
-# CONFIG_ADC_BATTERY is not set
-# CONFIG_APM_POWER is not set
+CONFIG_ADC_BATTERY=y
+CONFIG_APM_POWER=y
#
# L3 serial bus support
@@ -996,7 +997,7 @@ CONFIG_USB_ETH=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_PXA is not set
+CONFIG_MMC_PXA=y
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
@@ -1090,7 +1091,18 @@ CONFIG_RAMFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set