diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 17:07:41 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 17:07:41 -0400 |
| commit | 8efc59ad6764ade520012cb192cd484e5191cd9c (patch) | |
| tree | d2465d91ebb2652e35cd08f715fc202b3f9e042a /arch/alpha/Kconfig | |
| parent | 6f6184a9d01880a3e21349544f73b3720ce5e152 (diff) | |
| parent | 492c4a0df11573e141a2decc6012b3bddd14a11e (diff) | |
Merge branch 'sirf/cleanup' into next/cleanup
Diffstat (limited to 'arch/alpha/Kconfig')
| -rw-r--r-- | arch/alpha/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 60cde53d266c..8bb936226dee 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
| @@ -51,7 +51,7 @@ config GENERIC_CMOS_UPDATE | |||
| 51 | def_bool y | 51 | def_bool y |
| 52 | 52 | ||
| 53 | config GENERIC_GPIO | 53 | config GENERIC_GPIO |
| 54 | def_bool y | 54 | bool |
| 55 | 55 | ||
| 56 | config ZONE_DMA | 56 | config ZONE_DMA |
| 57 | bool | 57 | bool |