diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
| commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
| tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/arm/mach-omap1/board-nokia770.c | |
| parent | don't reallocate sxp variable passed into xfs_swapext (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 4970c402a594..af51e0b180f2 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -32,7 +32,6 @@ #include <mach/keypad.h> #include <mach/common.h> #include <mach/dsp_common.h> -#include <mach/aic23.h> #include <mach/omapfb.h> #include <mach/lcd_mipid.h> #include <mach/mmc.h> @@ -261,6 +260,13 @@ static DEFINE_MUTEX(audio_pwr_lock); */ static int audio_pwr_state = -1; +static inline void aic23_power_up(void) +{ +} +static inline void aic23_power_down(void) +{ +} + /* * audio_pwr_up / down should be called under audio_pwr_lock */ |