Merge remote-tracking branch 'security/next'

[karo-tx-linux.git] / arch / arm / mach-omap2 / opp2xxx.h

diff --git a/arch/arm/mach-omap2/opp2xxx.h b/arch/arm/mach-omap2/opp2xxx.h
index 8affc66a92c2c51745b2e380bdfb11e903741ed3..8fae534eb15711fe81d5f203821b5cf4823c8ab6 100644 (file)
--- a/arch/arm/mach-omap2/opp2xxx.h
+++ b/arch/arm/mach-omap2/opp2xxx.h
@@ -51,7 +51,7 @@ struct prcm_config {
        unsigned long cm_clksel2_pll;   /* dpllx1 or x2 out */
        unsigned long cm_clksel_mdm;    /* modem dividers 2430 only */
        unsigned long base_sdrc_rfr;    /* base refresh timing for a set */
-       unsigned char flags;
+       unsigned short flags;
 };