diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 08:10:36 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 08:10:36 +0200 | 
| commit | 5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (patch) | |
| tree | 10c4a86397d7ac6ae9a6bcc0e9438dd620246404 /arch/arm/include/asm/omap_common.h | |
| parent | 12eba1b49380988fd87cc0b3af44014cca8b71c4 (diff) | |
| parent | 827512fb1154c05c6eb1e2259e936df55c98a535 (diff) | |
| download | olio-uboot-2014.01-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.tar.xz olio-uboot-2014.01-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/omap_common.h')
| -rw-r--r-- | arch/arm/include/asm/omap_common.h | 6 | 
1 files changed, 0 insertions, 6 deletions
| diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 5e2f027ba..61fee9f06 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -310,12 +310,6 @@ struct prcm_regs {  	u32 prm_vc_val_bypass;  	u32 prm_vc_cfg_i2c_mode;  	u32 prm_vc_cfg_i2c_clk; -	u32 prm_sldo_core_setup; -	u32 prm_sldo_core_ctrl; -	u32 prm_sldo_mpu_setup; -	u32 prm_sldo_mpu_ctrl; -	u32 prm_sldo_mm_setup; -	u32 prm_sldo_mm_ctrl;  	u32 prm_abbldo_mpu_setup;  	u32 prm_abbldo_mpu_ctrl; |