diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:58:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:58:45 -0400 |
| commit | f589274533eb94e0217acc1db6240ce6e621bb56 (patch) | |
| tree | 884d4fde45bd578a240b4a61fe8de3b6a4c13880 /arch/x86 | |
| parent | 625fc3a37511cbecfe1253867fe105c28d6a95f0 (diff) | |
| parent | e3a2efa67a029453b8098dba179ec2d9d8df612e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc at91 minor bug fixes
[ALSA] soc - at91-pcm - Fix line wrapping
pcspkr: fix dependancies
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index bbdacb398d48..5e618c3b4720 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -83,9 +83,7 @@ obj-$(CONFIG_KVM_GUEST) += kvm.o | |||
| 83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o | 83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o |
| 84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o | 84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |
| 85 | 85 | ||
| 86 | ifdef CONFIG_INPUT_PCSPKR | 86 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
| 87 | obj-y += pcspeaker.o | ||
| 88 | endif | ||
| 89 | 87 | ||
| 90 | obj-$(CONFIG_SCx200) += scx200.o | 88 | obj-$(CONFIG_SCx200) += scx200.o |
| 91 | scx200-y += scx200_32.o | 89 | scx200-y += scx200_32.o |