diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /sound/isa/wss/Makefile | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'sound/isa/wss/Makefile')
| -rw-r--r-- | sound/isa/wss/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/isa/wss/Makefile b/sound/isa/wss/Makefile new file mode 100644 index 000000000000..454fee769a31 --- /dev/null +++ b/sound/isa/wss/Makefile | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | # | ||
| 2 | # Makefile for ALSA | ||
| 3 | # Copyright (c) 2008 by Jaroslav Kysela <perex@perex.cz> | ||
| 4 | # | ||
| 5 | |||
| 6 | snd-wss-lib-objs := wss_lib.o | ||
| 7 | |||
| 8 | # Toplevel Module Dependency | ||
| 9 | obj-$(CONFIG_SND_WSS_LIB) += snd-wss-lib.o | ||
| 10 | |||