diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /drivers/video/Kconfig | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index c94f71980c1b..f0267706cb45 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -41,7 +41,7 @@ menuconfig FB | |||
| 41 | You need an utility program called fbset to make full use of frame | 41 | You need an utility program called fbset to make full use of frame |
| 42 | buffer devices. Please read <file:Documentation/fb/framebuffer.txt> | 42 | buffer devices. Please read <file:Documentation/fb/framebuffer.txt> |
| 43 | and the Framebuffer-HOWTO at | 43 | and the Framebuffer-HOWTO at |
| 44 | <http://www.tahallah.demon.co.uk/programming/prog.html> for more | 44 | <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more |
| 45 | information. | 45 | information. |
| 46 | 46 | ||
| 47 | Say Y here and to the driver for your graphics board below if you | 47 | Say Y here and to the driver for your graphics board below if you |