Guest User

Untitled

a guest
Sep 3rd, 2014
7
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/arch/arm/configs/cyanogenmod_tuna_defconfig b/arch/arm/configs/cyanogenmod_tuna_defconfig
  2. index 4b93ccb..62ff0fd 100644
  3. --- a/arch/arm/configs/cyanogenmod_tuna_defconfig
  4. +++ b/arch/arm/configs/cyanogenmod_tuna_defconfig
  5. @@ -53,7 +53,7 @@ CONFIG_SYSVIPC_SYSCTL=y
  6.  # CONFIG_BSD_PROCESS_ACCT is not set
  7.  CONFIG_FHANDLE=y
  8.  # CONFIG_TASKSTATS is not set
  9. -CONFIG_AUDIT=n
  10. +# CONFIG_AUDIT is not set
  11.  CONFIG_HAVE_GENERIC_HARDIRQS=y
  12.  
  13.  #
  14. @@ -86,15 +86,15 @@ CONFIG_CGROUP_DEVICE=y
  15.  CONFIG_CGROUP_CPUACCT=y
  16.  CONFIG_RESOURCE_COUNTERS=y
  17.  CONFIG_CGROUP_MEM_RES_CTLR=y
  18. -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
  19.  CONFIG_CGROUP_PERF=y
  20.  CONFIG_CGROUP_SCHED=y
  21.  CONFIG_FAIR_GROUP_SCHED=y
  22.  CONFIG_RT_GROUP_SCHED=y
  23.  CONFIG_BLK_CGROUP=y
  24. -CONFIG_NETPRIO_CGROUP=y
  25. +# CONFIG_DEBUG_BLK_CGROUP is not set
  26.  # CONFIG_NAMESPACES is not set
  27.  # CONFIG_SCHED_AUTOGROUP is not set
  28. +CONFIG_MM_OWNER=y
  29.  # CONFIG_SYSFS_DEPRECATED is not set
  30.  # CONFIG_RELAY is not set
  31.  CONFIG_BLK_DEV_INITRD=y
  32. @@ -174,16 +174,18 @@ CONFIG_BLOCK=y
  33.  CONFIG_LBDAF=y
  34.  # CONFIG_BLK_DEV_BSG is not set
  35.  # CONFIG_BLK_DEV_INTEGRITY is not set
  36. +# CONFIG_BLK_DEV_THROTTLING is not set
  37.  
  38.  #
  39.  # IO Schedulers
  40.  #
  41.  CONFIG_IOSCHED_NOOP=y
  42.  CONFIG_IOSCHED_DEADLINE=y
  43. -CONFIG_IOSCHED_CFQ=y
  44.  CONFIG_IOSCHED_ROW=y
  45. -
  46. +CONFIG_IOSCHED_CFQ=y
  47. +# CONFIG_CFQ_GROUP_IOSCHED is not set
  48.  # CONFIG_DEFAULT_DEADLINE is not set
  49. +# CONFIG_DEFAULT_ROW is not set
  50.  CONFIG_DEFAULT_CFQ=y
  51.  # CONFIG_DEFAULT_NOOP is not set
  52.  CONFIG_DEFAULT_IOSCHED="cfq"
  53. @@ -536,6 +538,7 @@ CONFIG_WAKELOCK_STAT=y
  54.  CONFIG_USER_WAKELOCK=y
  55.  CONFIG_EARLYSUSPEND=y
  56.  # CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
  57. +# CONFIG_CONSOLE_EARLYSUSPEND is not set
  58.  CONFIG_FB_EARLYSUSPEND=y
  59.  CONFIG_PM_SLEEP=y
  60.  CONFIG_PM_SLEEP_SMP=y
  61. @@ -617,7 +620,7 @@ CONFIG_IPV6_TUNNEL=y
  62.  CONFIG_IPV6_MULTIPLE_TABLES=y
  63.  # CONFIG_IPV6_SUBTREES is not set
  64.  # CONFIG_IPV6_MROUTE is not set
  65. -CONFIG_ANDROID_PARANOID_NETWORK=n
  66. +# CONFIG_ANDROID_PARANOID_NETWORK is not set
  67.  CONFIG_NET_ACTIVITY_STATS=y
  68.  # CONFIG_NETWORK_SECMARK is not set
  69.  # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
  70. @@ -625,8 +628,6 @@ CONFIG_NETFILTER=y
  71.  # CONFIG_NETFILTER_DEBUG is not set
  72.  CONFIG_NETFILTER_ADVANCED=y
  73.  # CONFIG_BRIDGE_NETFILTER is not set
  74. -CONFIG_NETFILTER_XT_MATCH_NFACCT=y
  75. -CONFIG_NETFILTER_NETLINK_ACCT=y
  76.  
  77.  #
  78.  # Core Netfilter Configuration
  79. @@ -1062,7 +1063,7 @@ CONFIG_MISC_DEVICES=y
  80.  # CONFIG_INTEL_MID_PTI is not set
  81.  # CONFIG_ICS932S401 is not set
  82.  # CONFIG_ENCLOSURE_SERVICES is not set
  83. -CONFIG_SAMSUNG_JACK=n
  84. +# CONFIG_SAMSUNG_JACK is not set
  85.  # CONFIG_APDS9802ALS is not set
  86.  # CONFIG_ISL29003 is not set
  87.  # CONFIG_ISL29020 is not set
  88. @@ -1431,6 +1432,10 @@ CONFIG_SERIO_LIBPS2=y
  89.  # Character devices
  90.  #
  91.  CONFIG_VT=y
  92. +CONFIG_CONSOLE_TRANSLATIONS=y
  93. +CONFIG_VT_CONSOLE=y
  94. +CONFIG_HW_CONSOLE=y
  95. +# CONFIG_VT_HW_CONSOLE_BINDING is not set
  96.  CONFIG_UNIX98_PTYS=y
  97.  # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
  98.  # CONFIG_LEGACY_PTYS is not set
  99. @@ -1466,6 +1471,7 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
  100.  CONFIG_HW_RANDOM=y
  101.  # CONFIG_HW_RANDOM_TIMERIOMEM is not set
  102.  # CONFIG_HW_RANDOM_VIRTIO is not set
  103. +# CONFIG_NVRAM is not set
  104.  # CONFIG_R3964 is not set
  105.  # CONFIG_RAW_DRIVER is not set
  106.  # CONFIG_TCG_TPM is not set
  107. @@ -1803,6 +1809,7 @@ CONFIG_FB_OMAP2_NUM_FBS=3
  108.  #
  109.  CONFIG_PANEL_S6E8AA0=y
  110.  # CONFIG_PANEL_TAAL is not set
  111. +CONFIG_COLOR_HACK=y
  112.  CONFIG_DSSCOMP=y
  113.  CONFIG_DSSCOMP_DEBUG_LOG=y
  114.  CONFIG_OMAP4_HDCP=y
  115. @@ -1823,6 +1830,12 @@ CONFIG_DISPLAY_SUPPORT=y
  116.  #
  117.  # Display hardware drivers
  118.  #
  119. +
  120. +#
  121. +# Console display driver support
  122. +#
  123. +CONFIG_DUMMY_CONSOLE=y
  124. +# CONFIG_FRAMEBUFFER_CONSOLE is not set
  125.  # CONFIG_LOGO is not set
  126.  CONFIG_SOUND=y
  127.  # CONFIG_SOUND_OSS_CORE is not set
  128. @@ -2297,7 +2310,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
  129.  # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
  130.  CONFIG_ANDROID_TIMED_OUTPUT=y
  131.  CONFIG_ANDROID_TIMED_GPIO=y
  132. -CONFIG_ANDROID_LOW_MEMORY_KILLER=n
  133. +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
  134.  # CONFIG_POHMELFS is not set
  135.  # CONFIG_LINE6_USB is not set
  136.  # CONFIG_USB_SERIAL_QUATECH2 is not set
  137. @@ -2316,6 +2329,7 @@ CONFIG_MACH_NO_WESTBRIDGE=y
  138.  #
  139.  # Speakup console speech
  140.  #
  141. +# CONFIG_SPEAKUP is not set
  142.  # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
  143.  # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
  144.  
  145. @@ -2336,9 +2350,9 @@ CONFIG_VIRTIO_RING=m
  146.  # CONFIG_VIRTIO_BALLOON is not set
  147.  CONFIG_RPMSG=m
  148.  CONFIG_RPMSG_OMX=m
  149. -CONFIG_RPMSG_RESMGR=y
  150. -CONFIG_RPMSG_CLIENT_SAMPLE=n
  151. -CONFIG_RPMSG_SERVER_SAMPLE=n
  152. +CONFIG_RPMSG_RESMGR=m
  153. +# CONFIG_RPMSG_CLIENT_SAMPLE is not set
  154. +# CONFIG_RPMSG_SERVER_SAMPLE is not set
  155.  CONFIG_OMAP_HSI=y
  156.  CONFIG_OMAP_HSI_DEVICE=y
  157.  # CONFIG_OMAP_HSI_CHAR is not set
  158. @@ -2364,6 +2378,7 @@ CONFIG_JBD2=y
  159.  # CONFIG_BTRFS_FS is not set
  160.  # CONFIG_NILFS2_FS is not set
  161.  CONFIG_FS_POSIX_ACL=y
  162. +CONFIG_EXPORTFS=y
  163.  CONFIG_FILE_LOCKING=y
  164.  CONFIG_FSNOTIFY=y
  165.  # CONFIG_DNOTIFY is not set
  166. @@ -2396,6 +2411,8 @@ CONFIG_VFAT_FS=y
  167.  CONFIG_FAT_DEFAULT_CODEPAGE=437
  168.  CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  169.  CONFIG_NTFS_FS=y
  170. +# CONFIG_NTFS_DEBUG is not set
  171. +# CONFIG_NTFS_RW is not set
  172.  
  173.  #
  174.  # Pseudo filesystems
RAW Paste Data