diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
| commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
| tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /arch/arm/common/Kconfig | |
| parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/arm/common/Kconfig')
| -rw-r--r-- | arch/arm/common/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index ea5ee4d067f3..4b71766fb21d 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig | |||
| @@ -7,7 +7,7 @@ config ARM_VIC | |||
| 7 | config ARM_VIC_NR | 7 | config ARM_VIC_NR |
| 8 | int | 8 | int |
| 9 | default 4 if ARCH_S5PV210 | 9 | default 4 if ARCH_S5PV210 |
| 10 | default 3 if ARCH_S5P6442 || ARCH_S5PC100 | 10 | default 3 if ARCH_S5PC100 |
| 11 | default 2 | 11 | default 2 |
| 12 | depends on ARM_VIC | 12 | depends on ARM_VIC |
| 13 | help | 13 | help |