summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-05-05 11:31:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-05-05 11:31:35 +0200
commit8e91536a000c1738e354827d6f72965fa1444985 (patch)
treecb48104fa7a635e82d2b8b8eed6af6fe671756f2 /arch/arm/mach-socfpga
parent30cce0c7414498317a43b2020dc1737b007acf98 (diff)
parent0071bacb4c7cab21c9fab8540f5aa9922a270a85 (diff)
downloadbarebox-8e91536a000c1738e354827d6f72965fa1444985.tar.gz
barebox-8e91536a000c1738e354827d6f72965fa1444985.tar.xz
Merge branch 'for-next/parameter-types'
Diffstat (limited to 'arch/arm/mach-socfpga')
-rw-r--r--arch/arm/mach-socfpga/include/mach/sequencer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/sequencer.h b/arch/arm/mach-socfpga/include/mach/sequencer.h
index dd0378af34..d2da21d13f 100644
--- a/arch/arm/mach-socfpga/include/mach/sequencer.h
+++ b/arch/arm/mach-socfpga/include/mach/sequencer.h
@@ -369,7 +369,7 @@ static const uint32_t ac_rom_init[];
/* parameter variable holder */
-typedef struct param_type {
+typedef struct sequencer_param_type {
t_btfld dm_correct_mask;
t_btfld read_correct_mask;
t_btfld read_correct_mask_vg;