Skip to content

Commit

Permalink
More Makefile cleanups, otherwise mainly noticeable are the netfilter…
Browse files Browse the repository at this point in the history
… fix

and the LVM update.

		Linus

- Christoph Rohland: shmfs cleanup
- Nicolas Pitre: don't forget loop.c flags
- Geert Uytterhoeven: new-style m68k Makefiles
- Neil Brown: knfsd cleanups, raid5 re-org
- Andrea Arkangeli: update to LVM-0.9
- LC Chang: sis900 driver doc update
- David Miller: netfilter oops fix
- Andrew Grover: acpi update
  • Loading branch information
Linus Torvalds committed Nov 23, 2007
1 parent 4d37287 commit 5ecc69e
Show file tree
Hide file tree
Showing 97 changed files with 5,023 additions and 2,724 deletions.
4 changes: 2 additions & 2 deletions Documentation/Configure.help
Original file line number Diff line number Diff line change
Expand Up @@ -2352,10 +2352,10 @@ CONFIG_AGP
module, say M here and read Documentation/modules.txt. The module
will be called agpgart.o.

Intel 440LX/BX/GX support
Intel 440LX/BX/GX/815/840/850 support
CONFIG_AGP_INTEL
This option gives you AGP support for the GLX component of the
XFree86 4.x on Intel 440LX/BX/GX, 815, and 840 chipsets.
XFree86 4.x on Intel 440LX/BX/GX, 815, 840 and 850 chipsets.

For the moment, you should probably say N, unless you want to test
the GLX component for XFree86 3.3.6, which can be downloaded from
Expand Down
6 changes: 5 additions & 1 deletion Documentation/DocBook/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BOOKS := wanbook.sgml z8530book.sgml mcabook.sgml videobook.sgml \
kernel-api.sgml parportbook.sgml kernel-hacking.sgml \
kernel-locking.sgml via-audio.sgml mousedrivers.sgml
kernel-locking.sgml via-audio.sgml mousedrivers.sgml sis900.sgml

PS := $(patsubst %.sgml, %.ps, $(BOOKS))
PDF := $(patsubst %.sgml, %.pdf, $(BOOKS))
Expand Down Expand Up @@ -51,6 +51,10 @@ via-audio.sgml: via-audio.tmpl $(TOPDIR)/drivers/sound/via82cxxx_audio.c
$(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/sound/via82cxxx_audio.c \
<via-audio.tmpl >via-audio.sgml

sis900.sgml: sis900.tmpl $(TOPDIR)/drivers/net/sis900.c
$(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/net/sis900.c \
<sis900.tmpl >sis900.sgml

mcabook.sgml: mcabook.tmpl $(TOPDIR)/arch/i386/kernel/mca.c
$(TOPDIR)/scripts/docgen $(TOPDIR)/arch/i386/kernel/mca.c \
<mcabook.tmpl >mcabook.sgml
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocBook/kernel-locking.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
</row>
<row>
<entry></entry>
<entry>add 1 (5)</entry>
<entry>add 1 (6)</entry>
</row>
<row>
<entry>write very_important_count (6)</entry>
Expand Down
Loading

0 comments on commit 5ecc69e

Please sign in to comment.