diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 19:06:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 19:06:58 -0400 |
commit | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (patch) | |
tree | edbc09b7945994f78668d218fa02e991c3b3b365 /arch/arm/mach-orion5x/Kconfig | |
parent | 666484f0250db2e016948d63b3ef33e202e3b8d0 (diff) | |
parent | 53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
[ARM] 5171/1: ep93xx: fix compilation of modules using clocks
[ARM] 5133/2: at91sam9g20 defconfig file
[ARM] 5130/4: Support for the at91sam9g20
[ARM] 5160/1: IOP3XX: gpio/gpiolib support
[ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
[ARM] 5084/1: zylonite: Register AC97 device
[ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
[ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
[ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
[ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
[ARM] 5144/1: pxaficp_ir: cleanup includes
[ARM] pxa: remove pxa_set_cken()
[ARM] pxa: allow clk aliases
[ARM] Feroceon: don't disable BPU on boot
[ARM] Orion: LED support for HP mv2120
[ARM] Orion: add RD88F5181L-FXO support
[ARM] Orion: add RD88F5181L-GE support
[ARM] Orion: add Netgear WNR854T support
[ARM] s3c2410_defconfig: update for current build
[ARM] Acer n30: Minor style and indentation fixes.
...
Diffstat (limited to 'arch/arm/mach-orion5x/Kconfig')
-rw-r--r-- | arch/arm/mach-orion5x/Kconfig | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 93debf336155..ddcd41b15d17 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig | |||
@@ -44,6 +44,54 @@ config MACH_LINKSTATION_PRO | |||
44 | Buffalo Linkstation Pro/Live platform. Both v1 and | 44 | Buffalo Linkstation Pro/Live platform. Both v1 and |
45 | v2 devices are supported. | 45 | v2 devices are supported. |
46 | 46 | ||
47 | config MACH_TS409 | ||
48 | bool "QNAP TS-409" | ||
49 | help | ||
50 | Say 'Y' here if you want your kernel to support the | ||
51 | QNAP TS-409 platform. | ||
52 | |||
53 | config MACH_WRT350N_V2 | ||
54 | bool "Linksys WRT350N v2" | ||
55 | help | ||
56 | Say 'Y' here if you want your kernel to support the | ||
57 | Linksys WRT350N v2 platform. | ||
58 | |||
59 | config MACH_TS78XX | ||
60 | bool "Technologic Systems TS-78xx" | ||
61 | help | ||
62 | Say 'Y' here if you want your kernel to support the | ||
63 | Technologic Systems TS-78xx platform. | ||
64 | |||
65 | config MACH_MV2120 | ||
66 | bool "HP Media Vault mv2120" | ||
67 | help | ||
68 | Say 'Y' here if you want your kernel to support the | ||
69 | HP Media Vault mv2120 or mv5100. | ||
70 | |||
71 | config MACH_MSS2 | ||
72 | bool "Maxtor Shared Storage II" | ||
73 | help | ||
74 | Say 'Y' here if you want your kernel to support the | ||
75 | Maxtor Shared Storage II platform. | ||
76 | |||
77 | config MACH_WNR854T | ||
78 | bool "Netgear WNR854T" | ||
79 | help | ||
80 | Say 'Y' here if you want your kernel to support the | ||
81 | Netgear WNR854T platform. | ||
82 | |||
83 | config MACH_RD88F5181L_GE | ||
84 | bool "Marvell Orion-VoIP GE Reference Design" | ||
85 | help | ||
86 | Say 'Y' here if you want your kernel to support the | ||
87 | Marvell Orion-VoIP GE (88F5181L) RD. | ||
88 | |||
89 | config MACH_RD88F5181L_FXO | ||
90 | bool "Marvell Orion-VoIP FXO Reference Design" | ||
91 | help | ||
92 | Say 'Y' here if you want your kernel to support the | ||
93 | Marvell Orion-VoIP FXO (88F5181L) RD. | ||
94 | |||
47 | endmenu | 95 | endmenu |
48 | 96 | ||
49 | endif | 97 | endif |