git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2440
/
Kconfig
diff --git
a/arch/arm/mach-s3c2440/Kconfig
b/arch/arm/mach-s3c2440/Kconfig
index
c461fb8
..
914e620
100644
(file)
--- a/
arch/arm/mach-s3c2440/Kconfig
+++ b/
arch/arm/mach-s3c2440/Kconfig
@@
-5,7
+5,6
@@
config CPU_S3C2440
bool
select CPU_ARM920T
config CPU_S3C2440
bool
select CPU_ARM920T
- select S3C_GPIO_PULL_UP
select S3C2410_CLOCK
select S3C2410_PM if PM
select S3C2440_DMA if S3C2410_DMA
select S3C2410_CLOCK
select S3C2410_PM if PM
select S3C2440_DMA if S3C2410_DMA
@@
-17,7
+16,6
@@
config CPU_S3C2440
config CPU_S3C2442
bool
select CPU_ARM920T
config CPU_S3C2442
bool
select CPU_ARM920T
- select S3C_GPIO_PULL_DOWN
select S3C2410_CLOCK
select S3C2410_PM if PM
select CPU_S3C244X
select S3C2410_CLOCK
select S3C2410_PM if PM
select CPU_S3C244X