diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 21:47:48 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 21:47:48 +0100 |
commit | 586893ebc42943008010b4c210cfc9167df615e5 (patch) | |
tree | eec3179235978fba9ca6bfae0799d97c8532ee15 /arch/arm/mach-s5p6442/setup-i2c0.c | |
parent | 014322dac6ae0048c928c6ca2faf0d53194f9d15 (diff) | |
parent | bd6356bdafc853201168f718f0059fbe11191461 (diff) | |
download | blackbird-op-linux-586893ebc42943008010b4c210cfc9167df615e5.tar.gz blackbird-op-linux-586893ebc42943008010b4c210cfc9167df615e5.zip |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'arch/arm/mach-s5p6442/setup-i2c0.c')
-rw-r--r-- | arch/arm/mach-s5p6442/setup-i2c0.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-s5p6442/setup-i2c0.c b/arch/arm/mach-s5p6442/setup-i2c0.c deleted file mode 100644 index aad85656b0cc..000000000000 --- a/arch/arm/mach-s5p6442/setup-i2c0.c +++ /dev/null @@ -1,28 +0,0 @@ -/* linux/arch/arm/mach-s5p6442/setup-i2c0.c - * - * Copyright (c) 2009 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * I2C0 GPIO configuration. - * - * Based on plat-s3c64xx/setup-i2c0.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/gpio.h> - -struct platform_device; /* don't need the contents */ - -#include <plat/gpio-cfg.h> -#include <plat/iic.h> - -void s3c_i2c0_cfg_gpio(struct platform_device *dev) -{ - s3c_gpio_cfgall_range(S5P6442_GPD1(0), 2, - S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP); -} |