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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
Kconfig
diff --git
a/arch/arm/mach-s5p64x0/Kconfig
b/arch/arm/mach-s5p64x0/Kconfig
index
e51a5f1
..
18690c5
100644
(file)
--- a/
arch/arm/mach-s5p64x0/Kconfig
+++ b/
arch/arm/mach-s5p64x0/Kconfig
@@
-11,6
+11,8
@@
config CPU_S5P6440
bool
select SAMSUNG_DMADEV
select S5P_HRT
bool
select SAMSUNG_DMADEV
select S5P_HRT
+ select S5P_SLEEP if PM
+ select SAMSUNG_WAKEMASK if PM
help
Enable S5P6440 CPU support
help
Enable S5P6440 CPU support
@@
-18,6
+20,8
@@
config CPU_S5P6450
bool
select SAMSUNG_DMADEV
select S5P_HRT
bool
select SAMSUNG_DMADEV
select S5P_HRT
+ select S5P_SLEEP if PM
+ select SAMSUNG_WAKEMASK if PM
help
Enable S5P6450 CPU support
help
Enable S5P6450 CPU support
@@
-54,6
+58,7
@@
config MACH_SMDK6440
config MACH_SMDK6450
bool "SMDK6450"
select CPU_S5P6450
config MACH_SMDK6450
bool "SMDK6450"
select CPU_S5P6450
+ select S3C_DEV_FB
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
@@
-62,6
+67,7
@@
config MACH_SMDK6450
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
+ select S5P64X0_SETUP_FB_24BPP
select S5P64X0_SETUP_I2C1
help
Machine support for the Samsung SMDK6450
select S5P64X0_SETUP_I2C1
help
Machine support for the Samsung SMDK6450