diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-14 07:18:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-14 07:19:04 -0400 |
| commit | 6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e (patch) | |
| tree | 021cc9f6b477146fcebe6f3be4752abfa2ba18a9 /include/linux/mmc/cd-gpio.h | |
| parent | 682968e0c425c60f0dde37977e5beb2b12ddc4cc (diff) | |
| parent | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff) | |
Merge branch 'perf/core' into perf/uprobes
Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mmc/cd-gpio.h')
| -rw-r--r-- | include/linux/mmc/cd-gpio.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mmc/cd-gpio.h b/include/linux/mmc/cd-gpio.h index a8e469783318..cefaba038ccb 100644 --- a/include/linux/mmc/cd-gpio.h +++ b/include/linux/mmc/cd-gpio.h | |||
| @@ -12,8 +12,7 @@ | |||
| 12 | #define MMC_CD_GPIO_H | 12 | #define MMC_CD_GPIO_H |
| 13 | 13 | ||
| 14 | struct mmc_host; | 14 | struct mmc_host; |
| 15 | int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio, | 15 | int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio); |
| 16 | unsigned int irq, unsigned long flags); | ||
| 17 | void mmc_cd_gpio_free(struct mmc_host *host); | 16 | void mmc_cd_gpio_free(struct mmc_host *host); |
| 18 | 17 | ||
| 19 | #endif | 18 | #endif |