Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi

[~andy/linux] / drivers / oprofile / buffer_sync.h

diff --git a/drivers/oprofile/buffer_sync.h b/drivers/oprofile/buffer_sync.h
index 0ebf5db626796965fca5d44b6cda4d09a9a82708..3110732c1835acc640dbbc248d7a5c02403f0d83 100644 (file)
--- a/drivers/oprofile/buffer_sync.h
+++ b/drivers/oprofile/buffer_sync.h
@@ -19,8 +19,4 @@ void sync_stop(void);
 /* sync the given CPU's buffer */
 void sync_buffer(int cpu);
 
-/* initialize/destroy the buffer system. */
-int buffer_sync_init(void);
-void buffer_sync_cleanup(void);
-
 #endif /* OPROFILE_BUFFER_SYNC_H */