Message ID | 1237976781-3252-1-git-send-email-jarkko.nikula@nokia.com (mailing list archive) |
---|---|
State | Accepted |
Commit | bfed43659b0ffedf70d3dd41fc5658750f73890a |
Headers | show |
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Commit: bfed43659b0ffedf70d3dd41fc5658750f73890a PatchWorks http://patchwork.kernel.org/patch/14293/ Git http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=bfed43659b0ffedf70d3dd41fc5658750f73890a -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c index 60a414c..b90d153 100644 --- a/arch/arm/mach-omap2/board-n800.c +++ b/arch/arm/mach-omap2/board-n800.c @@ -568,10 +568,20 @@ static struct omap_gpio_switch n800_gpio_switches[] __initdata = { }, }; +#if defined(CONFIG_CBUS_RETU_HEADSET) +static struct platform_device retu_headset_device = { + .name = "retu-headset", + .id = -1, +}; +#endif + static struct platform_device *n800_devices[] __initdata = { #if defined(CONFIG_CBUS_RETU) && defined(CONFIG_LEDS_OMAP_PWM) &n800_keypad_led_device, #endif +#if defined(CONFIG_CBUS_RETU_HEADSET) + &retu_headset_device, +#endif }; #ifdef CONFIG_MENELAUS
This was earlier in board-n800-audio.c but got removed by the commit c65c733e1af5eac5681233309fed38538c9e06d2. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> --- arch/arm/mach-omap2/board-n800.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)