diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
| commit | 8b3f6af86378d0a10ca2f1ded1da124aef13b62c (patch) | |
| tree | de6ca90295730343c495be8d98be8efa322140ef /arch/arm/mach-mxc91231/Kconfig | |
| parent | 139d6065c83071d5f66cd013a274a43699f8e2c1 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
Diffstat (limited to 'arch/arm/mach-mxc91231/Kconfig')
| -rw-r--r-- | arch/arm/mach-mxc91231/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mxc91231/Kconfig b/arch/arm/mach-mxc91231/Kconfig new file mode 100644 index 000000000000..8e5fa38ebb67 --- /dev/null +++ b/arch/arm/mach-mxc91231/Kconfig | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | if ARCH_MXC91231 | ||
| 2 | |||
| 3 | comment "MXC91231 platforms:" | ||
| 4 | |||
| 5 | config MACH_MAGX_ZN5 | ||
| 6 | bool "Support Motorola Zn5 GSM phone" | ||
| 7 | default n | ||
| 8 | help | ||
| 9 | Include support for Motorola Zn5 GSM phone. | ||
| 10 | |||
| 11 | endif | ||