diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 12:10:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 12:10:44 -0400 |
| commit | bed7a560333d40269a886c4421d4c8f964a32177 (patch) | |
| tree | 2350415cae5724d07862a84140d94522fca3f6ab /drivers/video | |
| parent | 75dff55af9a989293e9f9bacf049858f4262bc08 (diff) | |
| parent | fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: Do not overwrite makefile as anohter user
kbuild: drivers/video/logo/ - fix ident glitch
kbuild: fix gen_initramfs_list.sh
kbuild modpost - relax driver data name
kbuild: removing .tmp_versions considered harmful
kbuild: fix modpost segfault for 64bit mipsel kernel
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/logo/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 4ef5cd19609d..b985dfad6c63 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile | |||
| @@ -34,7 +34,7 @@ extra-y += $(call logo-cfiles,_clut224,ppm) | |||
| 34 | extra-y += $(call logo-cfiles,_gray256,pgm) | 34 | extra-y += $(call logo-cfiles,_gray256,pgm) |
| 35 | 35 | ||
| 36 | # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." | 36 | # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." |
| 37 | quiet_cmd_logo = LOGO $@ | 37 | quiet_cmd_logo = LOGO $@ |
| 38 | cmd_logo = scripts/pnmtologo \ | 38 | cmd_logo = scripts/pnmtologo \ |
| 39 | -t $(patsubst $*_%,%,$(notdir $(basename $<))) \ | 39 | -t $(patsubst $*_%,%,$(notdir $(basename $<))) \ |
| 40 | -n $(notdir $(basename $<)) -o $@ $< | 40 | -n $(notdir $(basename $<)) -o $@ $< |