diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:23:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:23:46 -0800 |
| commit | ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3 (patch) | |
| tree | 3785afef7c0f7b72ec87f88fc19b88bfb48386fe /drivers/char/drm/Kconfig | |
| parent | e031d33efde817ce6b4f907f0fa1ff021301748f (diff) | |
| parent | 2b422383c3d8dcd203dd9aea70155be6258dbf6c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
README: bzip2 is not new
Documentation/Changes: remove outdated translation references
remove dead Radeon URL
SCSI_AACRAID: add a help text
update the i386 defconfig
MAINTAINERS: remove the LANMEDIA entry
Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files
Diffstat (limited to 'drivers/char/drm/Kconfig')
| -rw-r--r-- | drivers/char/drm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index 56ace9d5e2a..5278c388d3e 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig @@ -37,8 +37,8 @@ config DRM_RADEON help Choose this option if you have an ATI Radeon graphics card. There are both PCI and AGP versions. You don't need to choose this to - run the Radeon in plain VGA mode. There is a product page at - <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. + run the Radeon in plain VGA mode. + If M is selected, the module will be called radeon. config DRM_I810 |