diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:23:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:23:46 -0500 |
| commit | ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3 (patch) | |
| tree | 3785afef7c0f7b72ec87f88fc19b88bfb48386fe /drivers/video | |
| 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/video')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index f5079c78ba4e..fdebd60a3250 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -899,8 +899,6 @@ config FB_RADEON_OLD | |||
| 899 | Choose this option if you want to use an ATI Radeon graphics card as | 899 | Choose this option if you want to use an ATI Radeon graphics card as |
| 900 | a framebuffer device. There are both PCI and AGP versions. You | 900 | a framebuffer device. There are both PCI and AGP versions. You |
| 901 | don't need to choose this to run the Radeon in plain VGA mode. | 901 | don't need to choose this to run the Radeon in plain VGA mode. |
| 902 | There is a product page at | ||
| 903 | <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. | ||
| 904 | 902 | ||
| 905 | config FB_RADEON | 903 | config FB_RADEON |
| 906 | tristate "ATI Radeon display support" | 904 | tristate "ATI Radeon display support" |