Skip to content

Commit

Permalink
[ARM] pxa: removing dead CORGI_SSP_DEPRECATED
Browse files Browse the repository at this point in the history
CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
  • Loading branch information
Christoph Egger authored and Eric Miao committed Aug 5, 2010
1 parent 8ae807c commit 556a460
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,6 @@ config SHARPSL_PM

config SHARPSL_PM_MAX1111
bool
depends on !CORGI_SSP_DEPRECATED
select HWMON
select SENSORS_MAX1111

Expand Down
5 changes: 0 additions & 5 deletions arch/arm/mach-pxa/sharpsl_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
if (machine_is_tosa())
return 0;

#ifdef CONFIG_CORGI_SSP_DEPRECATED
return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
| MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
#else
extern int max1111_read_channel(int);

/* max1111 accepts channels from 0-3, however,
* it is encoded from 0-7 here in the code.
*/
return max1111_read_channel(channel >> 1);
#endif
}

static int get_percentage(int voltage)
Expand Down

0 comments on commit 556a460

Please sign in to comment.