Skip to content

L
linux
Commit fad8db49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://linux-sam.bkbits.net/kbuild 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 34bd8b6c 775b3260
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/ppc/boot/lib/Makefile
View file @ fad8db49
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
CFLAGS_kbd.o += -Idrivers/char CFLAGS_kbd.o += -Idrivers/char
lib-y := $(addprefix lib/zlib_inflate/,infblock.o infcodes.o inffast.o \ lib-y := $(addprefix ../../../../lib/zlib_inflate/, \
inflate.o inftrees.o infutil.o) infblock.o infcodes.o inffast.o inflate.o inftrees.o infutil.o)
lib-y += div64.o lib-y += div64.o
lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7