Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / clock_common_data.c

diff --git a/arch/arm/mach-omap2/clock_common_data.c b/arch/arm/mach-omap2/clock_common_data.c
index f69096b88cdbc3503c8a88a64ca0ebf95fc7a927..1cf8131205fa1f9ddfb1d754b87a698217f91c43 100644 (file)
--- a/arch/arm/mach-omap2/clock_common_data.c
+++ b/arch/arm/mach-omap2/clock_common_data.c
@@ -20,20 +20,20 @@
 
 /* clksel_rate data common to 24xx/343x */
 const struct clksel_rate gpt_32k_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE },
+        { .div = 1, .val = 0, .flags = RATE_IN_24XX | RATE_IN_3XXX },
         { .div = 0 }
 };
 
 const struct clksel_rate gpt_sys_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE },
+        { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_3XXX },
         { .div = 0 }
 };
 
 const struct clksel_rate gfx_l3_rates[] = {
-       { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_343X },
-       { .div = 2, .val = 2, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE },
-       { .div = 3, .val = 3, .flags = RATE_IN_243X | RATE_IN_343X },
-       { .div = 4, .val = 4, .flags = RATE_IN_243X | RATE_IN_343X },
+       { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_3XXX },
+       { .div = 2, .val = 2, .flags = RATE_IN_24XX | RATE_IN_3XXX },
+       { .div = 3, .val = 3, .flags = RATE_IN_243X | RATE_IN_3XXX },
+       { .div = 4, .val = 4, .flags = RATE_IN_243X | RATE_IN_3XXX },
        { .div = 0 }
 };