diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-08-12 10:17:57 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-08-12 10:17:57 +0300 |
| commit | eb75d05d96b824e14efa4de6c30692d300a9ce67 (patch) | |
| tree | c45c9eeba78667c800c16e2c9d37a73a6b7bbacc /include/linux/ring_buffer.h | |
| parent | ef9718b3d54e822de294351251f3a574f8a082ce (diff) | |
| parent | 03c5c350e38d9346b69357d0e52c3c40495c14a0 (diff) | |
| download | linux-eb75d05d96b824e14efa4de6c30692d300a9ce67.tar.xz | |
Merge branch 'topic/cirrus-hp-g12' into for-linus
Pull Cirrus HD-audio quirks for HP G12 laptops.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 96d2140b471e..fd35d4ec12e1 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -193,7 +193,6 @@ void ring_buffer_set_clock(struct trace_buffer *buffer, void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs); bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer); -size_t ring_buffer_nr_pages(struct trace_buffer *buffer, int cpu); size_t ring_buffer_nr_dirty_pages(struct trace_buffer *buffer, int cpu); struct buffer_data_read_page; |