Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...

[pandora-kernel.git] / include / linux / clocksource.h

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index f13469b..0fb0b7e 100644 (file)
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -161,7 +161,7 @@ struct clocksource {
        /*
         * First part of structure is read mostly
         */
        /*
         * First part of structure is read mostly
         */

-       char *name;
+       const char *name;

        struct list_head list;
        int rating;
        cycle_t (*read)(struct clocksource *cs);
        struct list_head list;
        int rating;
        cycle_t (*read)(struct clocksource *cs);