← Back to branch summary

~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to alsa-kernel/soc/sh/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-11-04 16:28:58 UTC
  • mfrom: (1.1.12 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104162858-7ky0tu33d7mn6oys
Tags: 1.0.21+dfsg-3ubuntu1
* Merge from debian unstable, remaining changes:
  - Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
  - debian/rules:
    + Don't install snddevices and program-wrapper
    + install alsa-base apport hook
    + Package separate USB card list file
  - Vcs and maintainer fields mangling
  - Rename blacklist files in /etc/modprobe.d to be consistant with the rest
    of the distro
  - debian/alsa-base.init:
    + create /var/run/alsa if it doesn't exist
    + Run alsactl store before force unloading modules
    + Run alsactl restore after reloading unloaded modules
  - debian/linux-sound-base.postrm: Remove /etc/modprobe.d/blacklist* files
    on package removal
  - Add missing $CMDLINE_OPTS to all install rules.
  - Replace -Q with --quiet.
  - Add --use-blacklist to all rules so the blacklist still takes effect.
  - debian/alsa-base.postinst: Do not run snddevices
  - retain patches:
    + add_suspend_quirk_hp_nc6220_nw8240.patch,
    + refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
alsa-kernel/soc/sh/Makefile
5
5
## audio units found on some SH-4
6
6
snd-soc-hac-objs        := hac.o
7
7
snd-soc-ssi-objs        := ssi.o
 
8
snd-soc-fsi-objs        := fsi.o
8
9
obj-$(CONFIG_SND_SOC_SH4_HAC)   += snd-soc-hac.o
9
10
obj-$(CONFIG_SND_SOC_SH4_SSI)   += snd-soc-ssi.o
 
11
obj-$(CONFIG_SND_SOC_SH4_FSI)   += snd-soc-fsi.o
10
12
 
11
13
## boards
12
14
snd-soc-sh7760-ac97-objs        := sh7760-ac97.o
 
15
snd-soc-fsi-ak4642-objs         := fsi-ak4642.o
13
16
 
14
17
obj-$(CONFIG_SND_SH7760_AC97)   += snd-soc-sh7760-ac97.o
 
18
obj-$(CONFIG_SND_FSI_AK4642)    += snd-soc-fsi-ak4642.o