diff options
| author | NeilBrown <neilb@suse.de> | 2010-05-21 18:31:36 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-21 18:31:36 -0400 |
| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 (patch) | |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 /sound/pci/asihpi/Makefile | |
| parent | be6800a73aa2f3dc14744c3b80e676d189789f04 (diff) | |
| parent | 3ff195b011d7decf501a4d55aeed312731094796 (diff) | |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'sound/pci/asihpi/Makefile')
| -rw-r--r-- | sound/pci/asihpi/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/asihpi/Makefile b/sound/pci/asihpi/Makefile new file mode 100644 index 000000000000..391830a4556c --- /dev/null +++ b/sound/pci/asihpi/Makefile | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | snd-asihpi-objs := asihpi.o hpioctl.o hpimsginit.o\ | ||
| 2 | hpicmn.o hpifunc.o hpidebug.o hpidspcd.o\ | ||
| 3 | hpios.o hpi6000.o hpi6205.o hpimsgx.o | ||
| 4 | |||
| 5 | obj-$(CONFIG_SND_ASIHPI) += snd-asihpi.o | ||