diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
tree | e2b9804379a6aab3d2471898d257fe5590feb70c /arch/powerpc/Kconfig | |
parent | c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (diff) | |
parent | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (diff) |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b6447190e1a..e625e9e034a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -4,6 +4,10 @@ config PPC32 bool default y if !PPC64 +config 32BIT + bool + default y if PPC32 + config 64BIT bool default y if PPC64 |