mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 08:33:17 +02:00
Merge branch 'intel-sst' of https://github.com/spandruvada/linux-kernel into review-ilpo-next
This commit is contained in:
commit
595c4b6724
|
|
@ -16,7 +16,7 @@ struct process_cmd_struct {
|
|||
int arg;
|
||||
};
|
||||
|
||||
static const char *version_str = "v1.20";
|
||||
static const char *version_str = "v1.21";
|
||||
|
||||
static const int supported_api_ver = 3;
|
||||
static struct isst_if_platform_info isst_platform_info;
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ static int tpmi_get_get_trls(struct isst_id *id, int config_index,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int tpmi_get_get_trl(struct isst_id *id, int level, int config_index,
|
||||
static int tpmi_get_get_trl(struct isst_id *id, int config_index, int level,
|
||||
int *trl)
|
||||
{
|
||||
struct isst_pkg_ctdp_level_info ctdp_level;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user