diff options
| author | James Simmons <jsimmons@kozmo.(none)> | 2002-12-01 17:49:02 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@kozmo.(none)> | 2002-12-01 17:49:02 -0800 |
| commit | 96b01c316893e7c329839ea71a8ed4bf38feb086 (patch) | |
| tree | 02c0ebc010a14955e52719792db367ff2fe52b53 /Documentation | |
| parent | 2aceefe4f67ce4df5a23ccdba8c6b2db79226bb8 (diff) | |
| parent | 07cf5ddf8fd4fe34ec5c4b9c86bc88fb12029794 (diff) | |
Merge kozmo.(none):/usr/src/linus-2.5
into kozmo.(none):/usr/src/fbdev-2.5
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 4 | ||||
| -rw-r--r-- | Documentation/fb/internals.txt | 5 | ||||
| -rw-r--r-- | Documentation/fb/sstfb.txt (renamed from Documentation/fb/README-sstfb.txt) | 0 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index 325a9447e073..f7b088432595 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl @@ -365,7 +365,7 @@ KAO --> !Edrivers/video/fbmem.c </sect1> <sect1><title>Frame Buffer Console</title> -!Edrivers/video/fbcon.c +!Edrivers/video/console/fbcon.c </sect1> <sect1><title>Frame Buffer Colormap</title> !Edrivers/video/fbcmap.c @@ -385,7 +385,7 @@ KAO --> !Idrivers/video/macmodes.c </sect1> <sect1><title>Frame Buffer Fonts</title> -!Idrivers/video/fonts.c +!Idrivers/video/console/fonts.c </sect1> </chapter> <!-- Needs ksyms to list additional exported symbols, but no specific doc. diff --git a/Documentation/fb/internals.txt b/Documentation/fb/internals.txt index a73d721d7bba..9b2a2b2f3e57 100644 --- a/Documentation/fb/internals.txt +++ b/Documentation/fb/internals.txt @@ -3,6 +3,7 @@ This is a first start for some documentation about frame buffer device internals. Geert Uytterhoeven <geert@linux-m68k.org>, 21 July 1998 +James Simmons <jsimmons@user.sf.net>, Nov 26 2002 -------------------------------------------------------------------------------- @@ -44,10 +45,6 @@ are defined in <linux/fb.h>. Device dependent information that uniquely defines the video mode for this particular piece of hardware. - - struct display - - Interface between the frame buffer device and the console driver. - -------------------------------------------------------------------------------- diff --git a/Documentation/fb/README-sstfb.txt b/Documentation/fb/sstfb.txt index b6d9d923fbb7..b6d9d923fbb7 100644 --- a/Documentation/fb/README-sstfb.txt +++ b/Documentation/fb/sstfb.txt |