diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 00:21:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 00:21:55 -0500 |
| commit | bb1281f2aae08e5ef23eb0692c8833e95579cdf2 (patch) | |
| tree | e00abd368a90eb947df37ba1e6082c864635cb80 /drivers/gpu/drm/qxl/Kconfig | |
| parent | 4988abf1749241bc80600a6b3283d03898d2717c (diff) | |
| parent | c04e7da0133fbe7f799b9356982371d228df9994 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science stuff from trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
neighbour.h: fix comment
sched: Fix warning on make htmldocs caused by wait.h
slab: struct kmem_cache is protected by slab_mutex
doc: Fix typo in USB Gadget Documentation
of/Kconfig: Spelling s/one/once/
mkregtable: Fix sscanf handling
lp5523, lp8501: comment improvements
thermal: rcar: comment spelling
treewide: fix comments and printk msgs
IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
Documentation: update /proc/uptime field description
Documentation: Fix size parameter for snprintf
arm: fix comment header and macro name
asm-generic: uaccess: Spelling s/a ny/any/
mtd: onenand: fix comment header
doc: driver-model/platform.txt: fix a typo
drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
doc: Fix typo (acces_process_vm -> access_process_vm)
treewide: Fix typos in printk
drivers/gpu/drm/qxl/Kconfig: reformat the help text
...
Diffstat (limited to 'drivers/gpu/drm/qxl/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/qxl/Kconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/qxl/Kconfig b/drivers/gpu/drm/qxl/Kconfig index 66ac0ff95f5a..38c2bb72e456 100644 --- a/drivers/gpu/drm/qxl/Kconfig +++ b/drivers/gpu/drm/qxl/Kconfig | |||
| @@ -5,9 +5,11 @@ config DRM_QXL | |||
| 5 | select FB_SYS_COPYAREA | 5 | select FB_SYS_COPYAREA |
| 6 | select FB_SYS_IMAGEBLIT | 6 | select FB_SYS_IMAGEBLIT |
| 7 | select FB_DEFERRED_IO | 7 | select FB_DEFERRED_IO |
| 8 | select DRM_KMS_HELPER | 8 | select DRM_KMS_HELPER |
| 9 | select DRM_KMS_FB_HELPER | 9 | select DRM_KMS_FB_HELPER |
| 10 | select DRM_TTM | 10 | select DRM_TTM |
| 11 | select CRC32 | 11 | select CRC32 |
| 12 | help | 12 | help |
| 13 | QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting. | 13 | QXL virtual GPU for Spice virtualization desktop integration. |
| 14 | Do not enable this driver unless your distro ships a corresponding | ||
| 15 | X.org QXL driver that can handle kernel modesetting. | ||