diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-20 14:03:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-20 14:03:04 +0100 |
| commit | 64bd43a086469a0bfdd87e012523184bdd96ce81 (patch) | |
| tree | f44ff7df4bae5ac265f68885663a790885895666 /arch/arm/mach-pxa/include/mach/palmasoc.h | |
| parent | 4a014a240b5a3c3b167702948a22dbe9e9a150a8 (diff) | |
| parent | a48dc30da44769ea3f3562c18f54878a9a3e78a1 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/palmasoc.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmasoc.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmasoc.h b/arch/arm/mach-pxa/include/mach/palmasoc.h index 6c4b1f7de20..58afb30d529 100644 --- a/arch/arm/mach-pxa/include/mach/palmasoc.h +++ b/arch/arm/mach-pxa/include/mach/palmasoc.h @@ -1,13 +1,8 @@ #ifndef _INCLUDE_PALMASOC_H_ #define _INCLUDE_PALMASOC_H_ + struct palm27x_asoc_info { int jack_gpio; }; -#ifdef CONFIG_SND_PXA2XX_SOC_PALM27X -void __init palm27x_asoc_set_pdata(struct palm27x_asoc_info *data); -#else -static inline void palm27x_asoc_set_pdata(struct palm27x_asoc_info *data) {} -#endif - #endif |