diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-16 13:24:27 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-16 13:24:27 -0400 |
| commit | 0a1f094ea7bfb405b96f53e5a6c55759e29e0987 (patch) | |
| tree | 0d1beed2b746cddce8ae295a4117003437b30533 /include/linux | |
| parent | 0f106b4f7fe6ad697cff5c02f0edd80bb066fabe (diff) | |
| parent | 678562e527fd9979f1765ffa1eb34738fc174425 (diff) | |
Merge commit 'v2.6.38.6' into linaro-2.6.38
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/flex_array.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/flex_array.h b/include/linux/flex_array.h index 70e4efabe0f..ebeb2f3ad06 100644 --- a/include/linux/flex_array.h +++ b/include/linux/flex_array.h @@ -61,7 +61,7 @@ struct flex_array { struct flex_array *flex_array_alloc(int element_size, unsigned int total, gfp_t flags); int flex_array_prealloc(struct flex_array *fa, unsigned int start, - unsigned int end, gfp_t flags); + unsigned int nr_elements, gfp_t flags); void flex_array_free(struct flex_array *fa); void flex_array_free_parts(struct flex_array *fa); int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src, diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index bcb793ec737..eb792cb6d74 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -183,7 +183,6 @@ struct mmc_host { struct work_struct clk_gate_work; /* delayed clock gate */ unsigned int clk_old; /* old clock value cache */ spinlock_t clk_lock; /* lock for clk fields */ - struct mutex clk_gate_mutex; /* mutex for clock gating */ #endif /* host specific block data */ |