← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/linux-ti-omap4/oneiric

« back to all changes in this revision

Viewing changes to debian.ti-omap4/config/config.common.ubuntu

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Ricardo Salveti de Araujo, Upstream Kernel Changes
  • Date: 2011-08-19 13:24:43 UTC
  • Revision ID: james.westby@ubuntu.com-20110819132443-ocl0v6q010d0yrep
Tags: 3.0.0-1203.7
[ Ricardo Salveti de Araujo ]

* [Config] Disable built-in SGX and enable CONFIG_DRM=m

[ Upstream Kernel Changes ]

* DRM: Revert one DRM change to make SGX work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian.ti-omap4/config/config.common.ubuntu
670
670
CONFIG_DNS_RESOLVER=y
671
671
CONFIG_DONGLE=y
672
672
CONFIG_DRAGONRISE_FF=y
673
 
# CONFIG_DRM is not set
 
673
CONFIG_DRM=m
674
674
CONFIG_DS1682=m
675
675
CONFIG_DUMMY=m
676
676
CONFIG_DUMMY_CONSOLE=y
2594
2594
CONFIG_SERIO_SERPORT=y
2595
2595
CONFIG_SGI_PARTITION=y
2596
2596
# CONFIG_SGX530 is not set
2597
 
CONFIG_SGX540=y
 
2597
# CONFIG_SGX540 is not set
2598
2598
# CONFIG_SGX_540_BUILD_DEBUG is not set
2599
 
CONFIG_SGX_540_BUILD_RELEASE=y
2600
 
# CONFIG_SGX_PDUMP is not set
 
2599
# CONFIG_SGX_540_BUILD_RELEASE is not set
2601
2600
# CONFIG_SGX_REV110 is not set
2602
 
CONFIG_SGX_REV120=y
 
2601
# CONFIG_SGX_REV120 is not set
2603
2602
CONFIG_SHMEM=y
2604
2603
CONFIG_SIGMATEL_FIR=m
2605
2604
CONFIG_SIGNALFD=y
3291
3290
# CONFIG_VIDEO_VPFE_CAPTURE is not set
3292
3291
CONFIG_VIDEO_W9966=m
3293
3292
CONFIG_VIDEO_WM8775=m
3294
 
# CONFIG_VIRTUAL_DISPLAY_SUPPORT is not set
3295
3293
CONFIG_VIRT_TO_BUS=y
3296
3294
CONFIG_VITESSE_PHY=m
3297
3295
CONFIG_VLAN_8021Q=m