diff options
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mmc/tegra_mmc.c (renamed from drivers/mmc/tegra2_mmc.c) | 4 | ||||
| -rw-r--r-- | drivers/mmc/tegra_mmc.h (renamed from drivers/mmc/tegra2_mmc.h) | 8 | 
3 files changed, 7 insertions, 7 deletions
| diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index a8e681c2f..c56773701 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -42,7 +42,7 @@ COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o  COBJS-$(CONFIG_SDHCI) += sdhci.o  COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o  COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o -COBJS-$(CONFIG_TEGRA2_MMC) += tegra2_mmc.o +COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o  COBJS	:= $(COBJS-y)  SRCS	:= $(COBJS:.o=.c) diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra_mmc.c index fb8a57d16..29bf58359 100644 --- a/drivers/mmc/tegra2_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -2,7 +2,7 @@   * (C) Copyright 2009 SAMSUNG Electronics   * Minkyu Kang <mk7.kang@samsung.com>   * Jaehoon Chung <jh80.chung@samsung.com> - * Portions Copyright 2011 NVIDIA Corporation + * Portions Copyright 2011-2012 NVIDIA Corporation   *   * 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 @@ -25,7 +25,7 @@  #include <asm/io.h>  #include <asm/arch/clk_rst.h>  #include <asm/arch/clock.h> -#include "tegra2_mmc.h" +#include "tegra_mmc.h"  /* support 4 mmc hosts */  struct mmc mmc_dev[4]; diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra_mmc.h index 67c00db9d..f9cdcaaaa 100644 --- a/drivers/mmc/tegra2_mmc.h +++ b/drivers/mmc/tegra_mmc.h @@ -1,7 +1,7 @@  /*   * (C) Copyright 2009 SAMSUNG Electronics   * Minkyu Kang <mk7.kang@samsung.com> - * Portions Copyright (C) 2011 NVIDIA Corporation + * Portions Copyright (C) 2011-2012 NVIDIA Corporation   *   * 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 @@ -19,8 +19,8 @@   *   */ -#ifndef __TEGRA2_MMC_H_ -#define __TEGRA2_MMC_H_ +#ifndef __TEGRA_MMC_H_ +#define __TEGRA_MMC_H_  #define TEGRA2_SDMMC1_BASE	0xC8000000  #define TEGRA2_SDMMC2_BASE	0xC8000200 @@ -128,4 +128,4 @@ struct mmc_host {  };  #endif	/* __ASSEMBLY__ */ -#endif	/* __TEGRA2_MMC_H_ */ +#endif	/* __TEGRA_MMC_H_ */ |