diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-21 11:16:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-21 11:17:06 +0100 |
| commit | 3fdecc7d9aca8a824ce3be9d20f6366d132579fc (patch) | |
| tree | 9be9686f26842e6deb0b04f597711cdc7526f58a /sound/core/Makefile | |
| parent | 5f91a62217730910ceb3e712dd0c28ee71423a27 (diff) | |
| parent | 67c3d7717efbd46092f217b1f811df1b205cce06 (diff) | |
Merge branch 'for-linus' into for-next
Pull 6.8-rc devel branch. The trivial merge conflict got resolved.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/Makefile')
| -rw-r--r-- | sound/core/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 1d34e6950317..b8aa886198ab 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -32,7 +32,6 @@ snd-ump-objs := ump.o snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o snd-timer-objs := timer.o snd-hrtimer-objs := hrtimer.o -snd-rtctimer-objs := rtctimer.o snd-hwdep-objs := hwdep.o snd-seq-device-objs := seq_device.o |