From 7878a57eee40d7189829c8a754cf0b73df20c819 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 11 Apr 2013 16:04:21 +0200 Subject: [PATCH] zynq: sdhci: Remove mmc.h and move it to sys_proto.h It is useless to have one huge file with one function declaration. Move it to sys_proto.h where others system functions are. Signed-off-by: Michal Simek --- arch/arm/include/asm/arch-zynq/mmc.h | 28 ---------------------- arch/arm/include/asm/arch-zynq/sys_proto.h | 3 +++ board/xilinx/zynq/board.c | 1 - drivers/mmc/zynq_sdhci.c | 2 +- 4 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 arch/arm/include/asm/arch-zynq/mmc.h diff --git a/arch/arm/include/asm/arch-zynq/mmc.h b/arch/arm/include/asm/arch-zynq/mmc.h deleted file mode 100644 index de0155a7d64..00000000000 --- a/arch/arm/include/asm/arch-zynq/mmc.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012 Joe Hershberger - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __ASM_ARCH_MMC_H_ -#define __ASM_ARCH_MMC_H_ - -int zynq_sdhci_init(u32 regbase); - -#endif /* __ASM_ARCH_MMC_H_ */ diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h index 411589eb525..372393971eb 100644 --- a/arch/arm/include/asm/arch-zynq/sys_proto.h +++ b/arch/arm/include/asm/arch-zynq/sys_proto.h @@ -33,4 +33,7 @@ extern u32 zynq_slcr_get_boot_mode(void); extern u32 zynq_slcr_get_idcode(void); extern int zynq_slcr_get_mio_pin_status(const char *periph); +/* Driver extern functions */ +extern int zynq_sdhci_init(u32 regbase); + #endif /* _SYS_PROTO_H_ */ diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 0fb99a47bd0..a190de2b536 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index d80f3537d5b..a3b9dfa552b 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include int zynq_sdhci_init(u32 regbase) { -- 2.47.3