diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 11:01:44 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 11:01:44 +0100 |
commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
tree | c65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/mach-u300/mmc.h | |
parent | 06099961002a813324d057a91695af7c72939da6 (diff) | |
parent | 7666c17e2b0986a079da46122d8658544416c2cf (diff) |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/mach-u300/mmc.h')
-rw-r--r-- | arch/arm/mach-u300/mmc.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/mmc.h b/arch/arm/mach-u300/mmc.h new file mode 100644 index 00000000000..92b85125abb --- /dev/null +++ b/arch/arm/mach-u300/mmc.h @@ -0,0 +1,18 @@ +/* + * + * arch/arm/mach-u300/mmc.h + * + * + * Copyright (C) 2009 ST-Ericsson AB + * License terms: GNU General Public License (GPL) version 2 + * + * Author: Jonas Aaberg <jonas.aberg@stericsson.com> + */ +#ifndef MMC_H +#define MMC_H + +#include <linux/amba/bus.h> + +int __devinit mmc_init(struct amba_device *adev); + +#endif |