Merge branches 'pm-cpufreq' and 'pm-cpuidle'

[linux-2.6-microblaze.git] / include / linux / trace_seq.h

diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h
index 6c30508..5a2c650 100644 (file)
--- a/include/linux/trace_seq.h
+++ b/include/linux/trace_seq.h
@@ -12,7 +12,7 @@
  */
 
 struct trace_seq {
-       unsigned char           buffer[PAGE_SIZE];
+       char                    buffer[PAGE_SIZE];
        struct seq_buf          seq;
        int                     full;
 };
@@ -51,7 +51,7 @@ static inline int trace_seq_used(struct trace_seq *s)
  * that is about to be written to and then return the result
  * of that write.
  */
-static inline unsigned char *
+static inline char *
 trace_seq_buffer_ptr(struct trace_seq *s)
 {
        return s->buffer + seq_buf_used(&s->seq);