Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / arch / arm / include / asm / arch-omap4 / mux_omap4.h

diff --git a/arch/arm/include/asm/arch-omap4/mux_omap4.h b/arch/arm/include/asm/arch-omap4/mux_omap4.h
index 019574b09f5582dd963c6c18a309c162b2409cff..4de7c70bf66b19957cdaaf9cb49777ecc05d4c2d 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/mux_omap4.h
+++ b/arch/arm/include/asm/arch-omap4/mux_omap4.h
@@ -34,7 +34,7 @@ struct pad_conf_entry {
 
        u16 val;
 
-} __attribute__ ((packed));
+};
 
 #ifdef CONFIG_OFF_PADCONF
 #define OFF_PD          (1 << 12)
@@ -341,4 +341,5 @@ struct pad_conf_entry {
 #define CONTROL_SPARE_R                0x0618
 #define CONTROL_SPARE_R_C0             0x061C
 
+#define CONTROL_WKUP_PAD1_FREF_CLK4_REQ        0x4A31E05A
 #endif /* _MUX_OMAP4_H_ */