Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

device-asus-laptop: Commit

device/asus/laptop


Commit MetaInfo

Revisiónee1cf1ed6c1e692939f1b41661657dccc0a74722 (tree)
Tiempo2011-05-23 13:12:08
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge branch 'froyo-x86' into gingerbread-x86

Conflicts:
BoardConfig.mk
laptop_defconfig
laptop_info

Cambiar Resumen

Diferencia

--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -1,5 +1,5 @@
11 LOCAL_PATH := $(call my-dir)
2-LOCAL_FIRMWARES := iwlwifi-1000-3.ucode iwlwifi-5000-2.ucode
2+LOCAL_FIRMWARES := iwlwifi-1000-3.ucode iwlwifi-5000-2.ucode $(subst device/common/firmware/,,$(wildcard device/common/firmware/radeon/*))
33 TARGET_INITRD_SCRIPTS := $(LOCAL_PATH)/laptop_info
44 TARGET_KERNEL_CONFIG := $(LOCAL_PATH)/laptop_defconfig
55
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,7 @@
11 TARGET_ARCH_VARIANT := x86-atom
22 TARGET_HAS_THIRD_PARTY_APPS := true
3+BOARD_USES_I915C := true
34 BOARD_USES_I965C := true
5+BOARD_USES_R600G := true
46
57 include $(GENERIC_X86_CONFIG_MK)
--- a/README
+++ b/README
@@ -4,8 +4,10 @@ Tested OK on:
44
55 * N82JV
66 * K42JV
7+* K52F
8+* K52JT
9+* K53E
710 * U45JC
811 * F82A
912 * A8L
10-* X52F
1113 * EP121
--- a/laptop.mk
+++ b/laptop.mk
@@ -1,5 +1,8 @@
11 PRODUCT_PACKAGES := $(THIRD_PARTY_APPS)
22
3+PRODUCT_COPY_FILES := \
4+ frameworks/base/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml
5+
36 $(call inherit-product,$(SRC_TARGET_DIR)/product/generic_x86.mk)
47
58 PRODUCT_NAME := asus_laptop
--- a/laptop_defconfig
+++ b/laptop_defconfig
@@ -1,7 +1,7 @@
11 #
22 # Automatically generated make config: don't edit
3-# Linux/x86 2.6.37 Kernel Configuration
4-# Mon Jan 24 00:19:49 2011
3+# Linux/x86 2.6.38 Kernel Configuration
4+# Fri May 6 10:57:16 2011
55 #
66 # CONFIG_64BIT is not set
77 CONFIG_X86_32=y
@@ -45,7 +45,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
4545 # CONFIG_AUDIT_ARCH is not set
4646 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
4747 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
48-CONFIG_USE_GENERIC_SMP_HELPERS=y
4948 CONFIG_X86_32_SMP=y
5049 CONFIG_X86_HT=y
5150 CONFIG_X86_TRAMPOLINE=y
@@ -70,10 +69,12 @@ CONFIG_LOCALVERSION="-android-x86-asus-laptop"
7069 CONFIG_HAVE_KERNEL_GZIP=y
7170 CONFIG_HAVE_KERNEL_BZIP2=y
7271 CONFIG_HAVE_KERNEL_LZMA=y
72+CONFIG_HAVE_KERNEL_XZ=y
7373 CONFIG_HAVE_KERNEL_LZO=y
7474 CONFIG_KERNEL_GZIP=y
7575 # CONFIG_KERNEL_BZIP2 is not set
7676 # CONFIG_KERNEL_LZMA is not set
77+# CONFIG_KERNEL_XZ is not set
7778 # CONFIG_KERNEL_LZO is not set
7879 # CONFIG_SWAP is not set
7980 CONFIG_SYSVIPC=y
@@ -88,7 +89,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
8889 # IRQ subsystem
8990 #
9091 CONFIG_GENERIC_HARDIRQS=y
91-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
9292 # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
9393 CONFIG_HAVE_SPARSE_IRQ=y
9494 CONFIG_GENERIC_IRQ_PROBE=y
@@ -112,6 +112,7 @@ CONFIG_LOG_BUF_SHIFT=17
112112 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
113113 # CONFIG_CGROUPS is not set
114114 # CONFIG_NAMESPACES is not set
115+# CONFIG_SCHED_AUTOGROUP is not set
115116 # CONFIG_SYSFS_DEPRECATED is not set
116117 # CONFIG_RELAY is not set
117118 CONFIG_BLK_DEV_INITRD=y
@@ -119,11 +120,13 @@ CONFIG_INITRAMFS_SOURCE=""
119120 CONFIG_RD_GZIP=y
120121 # CONFIG_RD_BZIP2 is not set
121122 # CONFIG_RD_LZMA is not set
123+# CONFIG_RD_XZ is not set
122124 # CONFIG_RD_LZO is not set
123125 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
124126 CONFIG_SYSCTL=y
125127 CONFIG_ANON_INODES=y
126128 CONFIG_PANIC_TIMEOUT=0
129+CONFIG_EXPERT=y
127130 CONFIG_EMBEDDED=y
128131 CONFIG_UID16=y
129132 CONFIG_SYSCTL_SYSCALL=y
@@ -167,6 +170,7 @@ CONFIG_HAVE_KRETPROBES=y
167170 CONFIG_HAVE_OPTPROBES=y
168171 CONFIG_HAVE_ARCH_TRACEHOOK=y
169172 CONFIG_HAVE_DMA_ATTRS=y
173+CONFIG_USE_GENERIC_SMP_HELPERS=y
170174 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
171175 CONFIG_HAVE_DMA_API_DEBUG=y
172176 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -248,6 +252,7 @@ CONFIG_X86_MPPARSE=y
248252 # CONFIG_X86_BIGSMP is not set
249253 # CONFIG_X86_EXTENDED_PLATFORM is not set
250254 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
255+# CONFIG_X86_32_IRIS is not set
251256 CONFIG_SCHED_OMIT_FRAME_POINTER=y
252257 # CONFIG_PARAVIRT_GUEST is not set
253258 CONFIG_NO_BOOTMEM=y
@@ -280,6 +285,7 @@ CONFIG_MCORE2=y
280285 CONFIG_X86_CPU=y
281286 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
282287 CONFIG_X86_CMPXCHG=y
288+CONFIG_CMPXCHG_LOCAL=y
283289 CONFIG_X86_L1_CACHE_SHIFT=6
284290 CONFIG_X86_XADD=y
285291 CONFIG_X86_WP_WORKS_OK=y
@@ -357,6 +363,7 @@ CONFIG_SPARSEMEM_STATIC=y
357363 CONFIG_HAVE_MEMBLOCK=y
358364 CONFIG_PAGEFLAGS_EXTENDED=y
359365 CONFIG_SPLIT_PTLOCK_CPUS=4
366+# CONFIG_COMPACTION is not set
360367 # CONFIG_PHYS_ADDR_T_64BIT is not set
361368 CONFIG_ZONE_DMA_FLAG=1
362369 CONFIG_BOUNCE=y
@@ -365,6 +372,7 @@ CONFIG_VIRT_TO_BUS=y
365372 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
366373 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
367374 # CONFIG_MEMORY_FAILURE is not set
375+# CONFIG_TRANSPARENT_HUGEPAGE is not set
368376 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
369377 CONFIG_X86_RESERVE_LOW=64
370378 # CONFIG_MATH_EMULATION is not set
@@ -395,7 +403,6 @@ CONFIG_PM=y
395403 # CONFIG_PM_DEBUG is not set
396404 CONFIG_PM_SLEEP_SMP=y
397405 CONFIG_PM_SLEEP=y
398-CONFIG_SUSPEND_NVS=y
399406 CONFIG_SUSPEND=y
400407 CONFIG_SUSPEND_FREEZER=y
401408 CONFIG_HAS_WAKELOCK=y
@@ -623,7 +630,9 @@ CONFIG_NET_ACTIVITY_STATS=y
623630 # CONFIG_IEEE802154 is not set
624631 # CONFIG_NET_SCHED is not set
625632 # CONFIG_DCB is not set
633+# CONFIG_BATMAN_ADV is not set
626634 CONFIG_RPS=y
635+CONFIG_XPS=y
627636
628637 #
629638 # Network testing
@@ -794,6 +803,7 @@ CONFIG_SATA_PMP=y
794803 CONFIG_SATA_AHCI=y
795804 # CONFIG_SATA_AHCI_PLATFORM is not set
796805 # CONFIG_SATA_INIC162X is not set
806+# CONFIG_SATA_ACARD_AHCI is not set
797807 # CONFIG_SATA_SIL24 is not set
798808 CONFIG_ATA_SFF=y
799809
@@ -884,10 +894,12 @@ CONFIG_BLK_DEV_DM=y
884894 CONFIG_DM_CRYPT=y
885895 # CONFIG_DM_SNAPSHOT is not set
886896 # CONFIG_DM_MIRROR is not set
897+# CONFIG_DM_RAID is not set
887898 # CONFIG_DM_ZERO is not set
888899 # CONFIG_DM_MULTIPATH is not set
889900 # CONFIG_DM_DELAY is not set
890901 CONFIG_DM_UEVENT=y
902+# CONFIG_TARGET_CORE is not set
891903 # CONFIG_FUSION is not set
892904
893905 #
@@ -954,6 +966,7 @@ CONFIG_ATH_COMMON=m
954966 # CONFIG_ATH_DEBUG is not set
955967 CONFIG_ATH5K=m
956968 # CONFIG_ATH5K_DEBUG is not set
969+CONFIG_ATH5K_PCI=y
957970 CONFIG_ATH9K_HW=m
958971 CONFIG_ATH9K_COMMON=m
959972 CONFIG_ATH9K=m
@@ -983,8 +996,10 @@ CONFIG_IWL5000=y
983996 # CONFIG_HERMES is not set
984997 # CONFIG_P54_COMMON is not set
985998 # CONFIG_RT2X00 is not set
999+# CONFIG_RTL8192CE is not set
1000+# CONFIG_WL is not set
9861001 # CONFIG_WL1251 is not set
987-# CONFIG_WL12XX is not set
1002+# CONFIG_WL12XX_MENU is not set
9881003 # CONFIG_ZD1211RW is not set
9891004
9901005 #
@@ -1002,6 +1017,7 @@ CONFIG_USB_USBNET=m
10021017 CONFIG_USB_NET_AX8817X=m
10031018 CONFIG_USB_NET_CDCETHER=m
10041019 # CONFIG_USB_NET_CDC_EEM is not set
1020+CONFIG_USB_NET_CDC_NCM=m
10051021 CONFIG_USB_NET_DM9601=m
10061022 # CONFIG_USB_NET_SMSC75XX is not set
10071023 CONFIG_USB_NET_SMSC95XX=m
@@ -1078,7 +1094,7 @@ CONFIG_INPUT_EVBUG=m
10781094 #
10791095 CONFIG_INPUT_KEYBOARD=y
10801096 # CONFIG_KEYBOARD_ADP5588 is not set
1081-CONFIG_KEYBOARD_ATKBD=y
1097+CONFIG_KEYBOARD_ATKBD=m
10821098 # CONFIG_KEYBOARD_QT2160 is not set
10831099 # CONFIG_KEYBOARD_LKKBD is not set
10841100 # CONFIG_KEYBOARD_TCA6416 is not set
@@ -1129,6 +1145,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
11291145 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
11301146 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
11311147 # CONFIG_TOUCHSCREEN_TSC2007 is not set
1148+# CONFIG_TOUCHSCREEN_ST1232 is not set
11321149 # CONFIG_TOUCHSCREEN_TPS6507X is not set
11331150 CONFIG_INPUT_MISC=y
11341151 # CONFIG_INPUT_AD714X is not set
@@ -1143,11 +1160,11 @@ CONFIG_INPUT_PCSPKR=m
11431160 # CONFIG_INPUT_POWERMATE is not set
11441161 # CONFIG_INPUT_YEALINK is not set
11451162 # CONFIG_INPUT_CM109 is not set
1146-CONFIG_INPUT_UINPUT=m
1147-# CONFIG_INPUT_WINBOND_CIR is not set
1163+CONFIG_INPUT_UINPUT=y
11481164 # CONFIG_INPUT_GPIO is not set
11491165 # CONFIG_INPUT_PCF8574 is not set
11501166 # CONFIG_INPUT_ADXL34X is not set
1167+# CONFIG_INPUT_CMA3000 is not set
11511168
11521169 #
11531170 # Hardware I/O ports
@@ -1199,6 +1216,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
11991216 # CONFIG_SERIAL_TIMBERDALE is not set
12001217 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
12011218 # CONFIG_SERIAL_ALTERA_UART is not set
1219+# CONFIG_SERIAL_PCH_UART is not set
12021220 CONFIG_UNIX98_PTYS=y
12031221 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
12041222 CONFIG_LEGACY_PTYS=y
@@ -1218,7 +1236,6 @@ CONFIG_NVRAM=m
12181236 # CONFIG_MWAVE is not set
12191237 # CONFIG_PC8736x_GPIO is not set
12201238 # CONFIG_NSC_GPIO is not set
1221-# CONFIG_CS5535_GPIO is not set
12221239 CONFIG_RAW_DRIVER=m
12231240 CONFIG_MAX_RAW_DEVS=4096
12241241 CONFIG_HPET=y
@@ -1273,6 +1290,7 @@ CONFIG_I2C_VIAPRO=m
12731290 # CONFIG_I2C_PCA_PLATFORM is not set
12741291 # CONFIG_I2C_SIMTEC is not set
12751292 # CONFIG_I2C_XILINX is not set
1293+# CONFIG_I2C_EG20T is not set
12761294
12771295 #
12781296 # External I2C/SMBus adapter drivers
@@ -1295,6 +1313,10 @@ CONFIG_I2C_VIAPRO=m
12951313 # PPS support
12961314 #
12971315 # CONFIG_PPS is not set
1316+
1317+#
1318+# PPS generators support
1319+#
12981320 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
12991321 # CONFIG_GPIOLIB is not set
13001322 # CONFIG_W1 is not set
@@ -1306,6 +1328,7 @@ CONFIG_PDA_POWER=y
13061328 # CONFIG_BATTERY_BQ20Z75 is not set
13071329 # CONFIG_BATTERY_BQ27x00 is not set
13081330 # CONFIG_BATTERY_MAX17040 is not set
1331+# CONFIG_BATTERY_MAX17042 is not set
13091332 CONFIG_HWMON=y
13101333 CONFIG_HWMON_VID=y
13111334 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1332,6 +1355,7 @@ CONFIG_HWMON_VID=y
13321355 # CONFIG_SENSORS_K10TEMP is not set
13331356 # CONFIG_SENSORS_ASB100 is not set
13341357 # CONFIG_SENSORS_ATXP1 is not set
1358+# CONFIG_SENSORS_DS620 is not set
13351359 # CONFIG_SENSORS_DS1621 is not set
13361360 # CONFIG_SENSORS_I5K_AMB is not set
13371361 # CONFIG_SENSORS_F71805F is not set
@@ -1366,6 +1390,7 @@ CONFIG_SENSORS_LM85=y
13661390 # CONFIG_SENSORS_PC87360 is not set
13671391 # CONFIG_SENSORS_PC87427 is not set
13681392 # CONFIG_SENSORS_PCF8591 is not set
1393+# CONFIG_SENSORS_SHT21 is not set
13691394 # CONFIG_SENSORS_SIS5595 is not set
13701395 # CONFIG_SENSORS_SMM665 is not set
13711396 # CONFIG_SENSORS_DME1737 is not set
@@ -1428,7 +1453,7 @@ CONFIG_MFD_CORE=m
14281453 # CONFIG_TPS6507X is not set
14291454 # CONFIG_TWL4030_CORE is not set
14301455 # CONFIG_MFD_STMPE is not set
1431-# CONFIG_MFD_TC35892 is not set
1456+# CONFIG_MFD_TC3589X is not set
14321457 # CONFIG_MFD_TMIO is not set
14331458 # CONFIG_PMIC_DA903X is not set
14341459 # CONFIG_PMIC_ADP5520 is not set
@@ -1440,10 +1465,12 @@ CONFIG_MFD_CORE=m
14401465 # CONFIG_MFD_WM8994 is not set
14411466 # CONFIG_MFD_PCF50633 is not set
14421467 # CONFIG_ABX500_CORE is not set
1468+# CONFIG_MFD_CS5535 is not set
14431469 CONFIG_LPC_SCH=m
14441470 # CONFIG_MFD_RDC321X is not set
14451471 # CONFIG_MFD_JANZ_CMODIO is not set
14461472 # CONFIG_MFD_VX855 is not set
1473+# CONFIG_MFD_WL1273_CORE is not set
14471474 # CONFIG_REGULATOR is not set
14481475 CONFIG_MEDIA_SUPPORT=m
14491476
@@ -1452,15 +1479,29 @@ CONFIG_MEDIA_SUPPORT=m
14521479 #
14531480 CONFIG_VIDEO_DEV=m
14541481 CONFIG_VIDEO_V4L2_COMMON=m
1455-# CONFIG_VIDEO_ALLOW_V4L1 is not set
1456-# CONFIG_VIDEO_V4L1_COMPAT is not set
14571482 # CONFIG_DVB_CORE is not set
14581483 CONFIG_VIDEO_MEDIA=m
14591484
14601485 #
14611486 # Multimedia drivers
14621487 #
1463-# CONFIG_IR_CORE is not set
1488+CONFIG_RC_CORE=m
1489+CONFIG_LIRC=m
1490+CONFIG_RC_MAP=m
1491+CONFIG_IR_NEC_DECODER=m
1492+CONFIG_IR_RC5_DECODER=m
1493+CONFIG_IR_RC6_DECODER=m
1494+CONFIG_IR_JVC_DECODER=m
1495+CONFIG_IR_SONY_DECODER=m
1496+CONFIG_IR_RC5_SZ_DECODER=m
1497+CONFIG_IR_LIRC_CODEC=m
1498+# CONFIG_IR_ENE is not set
1499+# CONFIG_IR_IMON is not set
1500+# CONFIG_IR_MCEUSB is not set
1501+# CONFIG_IR_NUVOTON is not set
1502+# CONFIG_IR_STREAMZAP is not set
1503+# CONFIG_IR_WINBOND_CIR is not set
1504+# CONFIG_RC_LOOPBACK is not set
14641505 # CONFIG_MEDIA_ATTACH is not set
14651506 CONFIG_MEDIA_TUNER=m
14661507 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -1482,6 +1523,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
14821523 # CONFIG_VIDEO_ADV_DEBUG is not set
14831524 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
14841525 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
1526+CONFIG_VIDEO_IR_I2C=m
14851527
14861528 #
14871529 # Audio decoders
@@ -1511,12 +1553,16 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
15111553 # Video improvement chips
15121554 #
15131555 CONFIG_VIDEO_VIVI=m
1556+# CONFIG_VIDEO_BT848 is not set
15141557 # CONFIG_VIDEO_CPIA2 is not set
15151558 # CONFIG_VIDEO_ZORAN is not set
15161559 # CONFIG_VIDEO_SAA7134 is not set
15171560 # CONFIG_VIDEO_MXB is not set
15181561 # CONFIG_VIDEO_HEXIUM_ORION is not set
15191562 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
1563+# CONFIG_VIDEO_TIMBERDALE is not set
1564+# CONFIG_VIDEO_CX88 is not set
1565+# CONFIG_VIDEO_IVTV is not set
15201566 # CONFIG_VIDEO_CAFE_CCIC is not set
15211567 # CONFIG_VIDEO_SR030PC30 is not set
15221568 # CONFIG_SOC_CAMERA is not set
@@ -1526,6 +1572,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
15261572 # CONFIG_USB_GSPCA is not set
15271573 # CONFIG_VIDEO_PVRUSB2 is not set
15281574 # CONFIG_VIDEO_HDPVR is not set
1575+# CONFIG_VIDEO_EM28XX is not set
1576+# CONFIG_VIDEO_CX231XX is not set
15291577 # CONFIG_VIDEO_USBVISION is not set
15301578 # CONFIG_USB_ET61X251 is not set
15311579 # CONFIG_USB_SN9C102 is not set
@@ -1535,7 +1583,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
15351583 # CONFIG_USB_S2255 is not set
15361584 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
15371585 # CONFIG_RADIO_ADAPTERS is not set
1538-# CONFIG_DAB is not set
15391586
15401587 #
15411588 # Graphics support
@@ -1558,7 +1605,8 @@ CONFIG_DRM_KMS_HELPER=m
15581605 CONFIG_DRM_TTM=m
15591606 # CONFIG_DRM_TDFX is not set
15601607 # CONFIG_DRM_R128 is not set
1561-# CONFIG_DRM_RADEON is not set
1608+CONFIG_DRM_RADEON=m
1609+CONFIG_DRM_RADEON_KMS=y
15621610 # CONFIG_DRM_I810 is not set
15631611 # CONFIG_DRM_I830 is not set
15641612 CONFIG_DRM_I915=m
@@ -1583,6 +1631,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
15831631 # CONFIG_FB_SYS_IMAGEBLIT is not set
15841632 # CONFIG_FB_FOREIGN_ENDIAN is not set
15851633 # CONFIG_FB_SYS_FOPS is not set
1634+# CONFIG_FB_WMT_GE_ROPS is not set
15861635 # CONFIG_FB_SVGALIB is not set
15871636 # CONFIG_FB_MACMODES is not set
15881637 CONFIG_FB_BACKLIGHT=y
@@ -1628,6 +1677,7 @@ CONFIG_FB_VESA=y
16281677 # CONFIG_FB_CARMINE is not set
16291678 # CONFIG_FB_GEODE is not set
16301679 # CONFIG_FB_TMIO is not set
1680+# CONFIG_FB_UDL is not set
16311681 # CONFIG_FB_VIRTUAL is not set
16321682 # CONFIG_FB_METRONOME is not set
16331683 # CONFIG_FB_MB862XX is not set
@@ -1676,6 +1726,7 @@ CONFIG_SND_TIMER=m
16761726 CONFIG_SND_PCM=m
16771727 CONFIG_SND_HWDEP=m
16781728 CONFIG_SND_RAWMIDI=m
1729+CONFIG_SND_JACK=y
16791730 CONFIG_SND_SEQUENCER=m
16801731 # CONFIG_SND_SEQ_DUMMY is not set
16811732 # CONFIG_SND_MIXER_OSS is not set
@@ -1749,24 +1800,23 @@ CONFIG_SND_HDA_INTEL=m
17491800 CONFIG_SND_HDA_HWDEP=y
17501801 CONFIG_SND_HDA_RECONFIG=y
17511802 # CONFIG_SND_HDA_INPUT_BEEP is not set
1752-# CONFIG_SND_HDA_INPUT_JACK is not set
1803+CONFIG_SND_HDA_INPUT_JACK=y
17531804 # CONFIG_SND_HDA_PATCH_LOADER is not set
17541805 CONFIG_SND_HDA_CODEC_REALTEK=y
17551806 # CONFIG_SND_HDA_CODEC_ANALOG is not set
17561807 # CONFIG_SND_HDA_CODEC_SIGMATEL is not set
1757-# CONFIG_SND_HDA_CODEC_VIA is not set
1808+CONFIG_SND_HDA_CODEC_VIA=y
17581809 CONFIG_SND_HDA_CODEC_HDMI=y
17591810 CONFIG_SND_HDA_CODEC_CIRRUS=y
1760-# CONFIG_SND_HDA_CODEC_CONEXANT is not set
1811+CONFIG_SND_HDA_CODEC_CONEXANT=y
17611812 CONFIG_SND_HDA_CODEC_CA0110=y
17621813 # CONFIG_SND_HDA_CODEC_CMEDIA is not set
17631814 # CONFIG_SND_HDA_CODEC_SI3054 is not set
1764-# CONFIG_SND_HDA_GENERIC is not set
1815+CONFIG_SND_HDA_GENERIC=y
17651816 CONFIG_SND_HDA_POWER_SAVE=y
17661817 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=3
17671818 # CONFIG_SND_HDSP is not set
17681819 # CONFIG_SND_HDSPM is not set
1769-# CONFIG_SND_HIFIER is not set
17701820 # CONFIG_SND_ICE1712 is not set
17711821 # CONFIG_SND_ICE1724 is not set
17721822 # CONFIG_SND_INTEL8X0 is not set
@@ -1791,7 +1841,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=3
17911841 # CONFIG_SND_YMFPCI is not set
17921842 CONFIG_SND_USB=y
17931843 CONFIG_SND_USB_AUDIO=m
1794-CONFIG_SND_USB_UA101=m
1844+# CONFIG_SND_USB_UA101 is not set
17951845 CONFIG_SND_USB_USX2Y=m
17961846 CONFIG_SND_USB_CAIAQ=m
17971847 # CONFIG_SND_USB_CAIAQ_INPUT is not set
@@ -1800,7 +1850,7 @@ CONFIG_SND_USB_US122L=m
18001850 # CONFIG_SOUND_PRIME is not set
18011851 CONFIG_HID_SUPPORT=y
18021852 CONFIG_HID=y
1803-# CONFIG_HIDRAW is not set
1853+CONFIG_HIDRAW=y
18041854
18051855 #
18061856 # USB Input Devices
@@ -1812,18 +1862,16 @@ CONFIG_USB_HID=y
18121862 #
18131863 # Special HID drivers
18141864 #
1815-# CONFIG_HID_3M_PCT is not set
18161865 # CONFIG_HID_A4TECH is not set
18171866 # CONFIG_HID_ACRUX_FF is not set
18181867 # CONFIG_HID_APPLE is not set
18191868 # CONFIG_HID_BELKIN is not set
1820-# CONFIG_HID_CANDO is not set
18211869 # CONFIG_HID_CHERRY is not set
18221870 # CONFIG_HID_CHICONY is not set
18231871 # CONFIG_HID_PRODIKEYS is not set
18241872 # CONFIG_HID_CYPRESS is not set
18251873 # CONFIG_HID_DRAGONRISE is not set
1826-CONFIG_HID_EGALAX=m
1874+# CONFIG_HID_EMS_FF is not set
18271875 # CONFIG_HID_ELECOM is not set
18281876 # CONFIG_HID_EZKEY is not set
18291877 # CONFIG_HID_KYE is not set
@@ -1835,8 +1883,8 @@ CONFIG_HID_EGALAX=m
18351883 # CONFIG_HID_LOGITECH is not set
18361884 # CONFIG_HID_MAGICMOUSE is not set
18371885 # CONFIG_HID_MICROSOFT is not set
1838-# CONFIG_HID_MOSART is not set
18391886 # CONFIG_HID_MONTEREY is not set
1887+CONFIG_HID_MULTITOUCH=m
18401888 # CONFIG_HID_NTRIG is not set
18411889 # CONFIG_HID_ORTEK is not set
18421890 # CONFIG_HID_PANTHERLORD is not set
@@ -1845,10 +1893,10 @@ CONFIG_HID_EGALAX=m
18451893 # CONFIG_HID_QUANTA is not set
18461894 # CONFIG_HID_ROCCAT is not set
18471895 # CONFIG_HID_ROCCAT_KONE is not set
1896+# CONFIG_HID_ROCCAT_KONEPLUS is not set
18481897 # CONFIG_HID_ROCCAT_PYRA is not set
18491898 # CONFIG_HID_SAMSUNG is not set
18501899 # CONFIG_HID_SONY is not set
1851-# CONFIG_HID_STANTUM is not set
18521900 # CONFIG_HID_SUNPLUS is not set
18531901 # CONFIG_HID_GREENASIA is not set
18541902 # CONFIG_HID_SMARTJOYPLUS is not set
@@ -1857,7 +1905,6 @@ CONFIG_HID_EGALAX=m
18571905 # CONFIG_HID_WACOM is not set
18581906 # CONFIG_HID_ZEROPLUS is not set
18591907 # CONFIG_HID_ZYDACRON is not set
1860-# CONFIG_HID_HANVON is not set
18611908 CONFIG_USB_SUPPORT=y
18621909 CONFIG_USB_ARCH_HAS_HCD=y
18631910 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1869,7 +1916,7 @@ CONFIG_USB=y
18691916 #
18701917 # Miscellaneous USB options
18711918 #
1872-# CONFIG_USB_DEVICEFS is not set
1919+CONFIG_USB_DEVICEFS=y
18731920 # CONFIG_USB_DEVICE_CLASS is not set
18741921 # CONFIG_USB_DYNAMIC_MINORS is not set
18751922 # CONFIG_USB_OTG_WHITELIST is not set
@@ -2028,6 +2075,7 @@ CONFIG_USB_LED=m
20282075 CONFIG_MMC=y
20292076 # CONFIG_MMC_DEBUG is not set
20302077 # CONFIG_MMC_UNSAFE_RESUME is not set
2078+# CONFIG_MMC_CLKGATE is not set
20312079 # CONFIG_MMC_EMBEDDED_SDIO is not set
20322080 # CONFIG_MMC_PARANOID_SD_INIT is not set
20332081
@@ -2084,6 +2132,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
20842132 #
20852133 # iptables trigger is under Netfilter config (LED target)
20862134 #
2135+# CONFIG_NFC_DEVICES is not set
20872136 CONFIG_SWITCH=y
20882137 # CONFIG_ACCESSIBILITY is not set
20892138 # CONFIG_INFINIBAND is not set
@@ -2175,6 +2224,11 @@ CONFIG_STAGING=y
21752224 # CONFIG_STAGING_EXCLUDE_BUILD is not set
21762225 # CONFIG_ET131X is not set
21772226 # CONFIG_SLICOSS is not set
2227+# CONFIG_VIDEO_GO7007 is not set
2228+# CONFIG_VIDEO_TM6000 is not set
2229+# CONFIG_USB_DABUSB is not set
2230+# CONFIG_USB_SE401 is not set
2231+# CONFIG_USB_VICAM is not set
21782232 # CONFIG_USB_IP_COMMON is not set
21792233 # CONFIG_W35UND is not set
21802234 # CONFIG_PRISM2_USB is not set
@@ -2220,12 +2274,12 @@ CONFIG_DRM_I2C_SIL164=m
22202274 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
22212275 # CONFIG_VT6655 is not set
22222276 # CONFIG_VT6656 is not set
2223-# CONFIG_FB_UDL is not set
22242277 # CONFIG_HYPERV is not set
22252278 # CONFIG_VME_BUS is not set
2279+# CONFIG_DX_SEP is not set
22262280 # CONFIG_IIO is not set
2281+# CONFIG_CS5535_GPIO is not set
22272282 # CONFIG_ZRAM is not set
2228-# CONFIG_BATMAN_ADV is not set
22292283 # CONFIG_SAMSUNG_LAPTOP is not set
22302284 # CONFIG_FB_SM7XX is not set
22312285 # CONFIG_VIDEO_DT3155 is not set
@@ -2236,6 +2290,7 @@ CONFIG_DRM_I2C_SIL164=m
22362290 #
22372291 # CONFIG_ST_BT is not set
22382292 # CONFIG_FB_XGI is not set
2293+# CONFIG_LIRC_STAGING is not set
22392294 # CONFIG_SMB_FS is not set
22402295 # CONFIG_EASYCAP is not set
22412296 # CONFIG_SOLO6X10 is not set
@@ -2250,6 +2305,7 @@ CONFIG_MACH_NO_WESTBRIDGE=y
22502305 # Speakup console speech
22512306 #
22522307 # CONFIG_SPEAKUP is not set
2308+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
22532309 CONFIG_X86_PLATFORM_DEVICES=y
22542310 # CONFIG_ACER_WMI is not set
22552311 CONFIG_ASUS_LAPTOP=m
@@ -2269,6 +2325,7 @@ CONFIG_EEEPC_LAPTOP=m
22692325 CONFIG_EEEPC_WMI=m
22702326 CONFIG_ACPI_WMI=y
22712327 # CONFIG_MSI_WMI is not set
2328+# CONFIG_S103T_WMI is not set
22722329 CONFIG_ACPI_ASUS=m
22732330 # CONFIG_TOPSTAR_LAPTOP is not set
22742331 # CONFIG_ACPI_TOSHIBA is not set
@@ -2312,12 +2369,12 @@ CONFIG_JBD2=y
23122369 CONFIG_FS_MBCACHE=y
23132370 # CONFIG_REISERFS_FS is not set
23142371 # CONFIG_JFS_FS is not set
2315-# CONFIG_FS_POSIX_ACL is not set
23162372 # CONFIG_XFS_FS is not set
23172373 # CONFIG_GFS2_FS is not set
23182374 # CONFIG_OCFS2_FS is not set
23192375 # CONFIG_BTRFS_FS is not set
23202376 # CONFIG_NILFS2_FS is not set
2377+# CONFIG_FS_POSIX_ACL is not set
23212378 CONFIG_FILE_LOCKING=y
23222379 CONFIG_FSNOTIFY=y
23232380 # CONFIG_DNOTIFY is not set
@@ -2382,7 +2439,8 @@ CONFIG_MISC_FILESYSTEMS=y
23822439 # CONFIG_CRAMFS is not set
23832440 CONFIG_SQUASHFS=y
23842441 CONFIG_SQUASHFS_XATTR=y
2385-# CONFIG_SQUASHFS_LZO is not set
2442+CONFIG_SQUASHFS_LZO=y
2443+CONFIG_SQUASHFS_XZ=y
23862444 # CONFIG_SQUASHFS_EMBEDDED is not set
23872445 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
23882446 # CONFIG_VXFS_FS is not set
@@ -2509,6 +2567,7 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
25092567 CONFIG_X86_VERBOSE_BOOTUP=y
25102568 CONFIG_EARLY_PRINTK=y
25112569 # CONFIG_EARLY_PRINTK_DBGP is not set
2570+# CONFIG_DEBUG_SET_MODULE_RONX is not set
25122571 CONFIG_DOUBLEFAULT=y
25132572 # CONFIG_IOMMU_STRESS is not set
25142573 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -2608,6 +2667,7 @@ CONFIG_CRYPTO_WP512=m
26082667 #
26092668 CONFIG_CRYPTO_AES=y
26102669 CONFIG_CRYPTO_AES_586=m
2670+# CONFIG_CRYPTO_AES_NI_INTEL is not set
26112671 CONFIG_CRYPTO_ANUBIS=m
26122672 CONFIG_CRYPTO_ARC4=y
26132673 CONFIG_CRYPTO_BLOWFISH=m
@@ -2637,6 +2697,8 @@ CONFIG_CRYPTO_DEFLATE=m
26372697 # Random Number Generation
26382698 #
26392699 # CONFIG_CRYPTO_ANSI_CPRNG is not set
2700+# CONFIG_CRYPTO_USER_API_HASH is not set
2701+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
26402702 # CONFIG_CRYPTO_HW is not set
26412703 CONFIG_HAVE_KVM=y
26422704 # CONFIG_VIRTUALIZATION is not set
@@ -2658,8 +2720,19 @@ CONFIG_CRC7=m
26582720 CONFIG_LIBCRC32C=m
26592721 CONFIG_ZLIB_INFLATE=y
26602722 CONFIG_ZLIB_DEFLATE=m
2723+CONFIG_LZO_DECOMPRESS=y
2724+CONFIG_XZ_DEC=y
2725+CONFIG_XZ_DEC_X86=y
2726+CONFIG_XZ_DEC_POWERPC=y
2727+CONFIG_XZ_DEC_IA64=y
2728+CONFIG_XZ_DEC_ARM=y
2729+CONFIG_XZ_DEC_ARMTHUMB=y
2730+CONFIG_XZ_DEC_SPARC=y
2731+CONFIG_XZ_DEC_BCJ=y
2732+# CONFIG_XZ_DEC_TEST is not set
26612733 CONFIG_DECOMPRESS_GZIP=y
26622734 CONFIG_HAS_IOMEM=y
26632735 CONFIG_HAS_IOPORT=y
26642736 CONFIG_HAS_DMA=y
26652737 CONFIG_NLATTR=y
2738+CONFIG_AVERAGE=y
--- a/laptop_info
+++ b/laptop_info
@@ -5,7 +5,7 @@ laptop_info()
55 board=`cat $DMIPATH/product_name`
66 case "$board" in
77 EP121*)
8- BOARD_USES_TSLIB=true
8+ EXTMOD="$EXTMOD hid-multitouch"
99 ;;
1010 *)
1111 ;;
--- a/system.prop
+++ b/system.prop
@@ -1,2 +1,2 @@
1-# system.prop for n-series
2-# end system.prop for n-series
1+# system.prop for asus-laptop
2+# end system.prop for asus-laptop
Show on old repository browser