diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /arch/arm/mach-h720x/Kconfig | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
Diffstat (limited to 'arch/arm/mach-h720x/Kconfig')
| -rw-r--r-- | arch/arm/mach-h720x/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-h720x/Kconfig b/arch/arm/mach-h720x/Kconfig index 9b6982efbd22..abf356c02343 100644 --- a/arch/arm/mach-h720x/Kconfig +++ b/arch/arm/mach-h720x/Kconfig | |||
| @@ -6,12 +6,14 @@ config ARCH_H7201 | |||
| 6 | bool "gms30c7201" | 6 | bool "gms30c7201" |
| 7 | depends on ARCH_H720X | 7 | depends on ARCH_H720X |
| 8 | select CPU_H7201 | 8 | select CPU_H7201 |
| 9 | select ZONE_DMA | ||
| 9 | help | 10 | help |
| 10 | Say Y here if you are using the Hynix GMS30C7201 Reference Board | 11 | Say Y here if you are using the Hynix GMS30C7201 Reference Board |
| 11 | 12 | ||
| 12 | config ARCH_H7202 | 13 | config ARCH_H7202 |
| 13 | bool "hms30c7202" | 14 | bool "hms30c7202" |
| 14 | select CPU_H7202 | 15 | select CPU_H7202 |
| 16 | select ZONE_DMA | ||
| 15 | depends on ARCH_H720X | 17 | depends on ARCH_H720X |
| 16 | help | 18 | help |
| 17 | Say Y here if you are using the Hynix HMS30C7202 Reference Board | 19 | Say Y here if you are using the Hynix HMS30C7202 Reference Board |