diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/macintosh/adbhid.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/mmc_spi.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 8cce016b3d09..2766e4fc4ea8 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
@@ -282,7 +282,7 @@ static void | |||
282 | adbhid_input_keycode(int id, int scancode, int repeat) | 282 | adbhid_input_keycode(int id, int scancode, int repeat) |
283 | { | 283 | { |
284 | struct adbhid *ahid = adbhid[id]; | 284 | struct adbhid *ahid = adbhid[id]; |
285 | int keycode, up_flag; | 285 | int keycode, up_flag, key; |
286 | 286 | ||
287 | keycode = scancode & 0x7f; | 287 | keycode = scancode & 0x7f; |
288 | up_flag = scancode & 0x80; | 288 | up_flag = scancode & 0x80; |
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 71b986b38c55..7ae18eaed6c5 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
31 | #include <linux/crc7.h> | 31 | #include <linux/crc7.h> |
32 | #include <linux/crc-itu-t.h> | 32 | #include <linux/crc-itu-t.h> |
33 | #include <linux/scatterlist.h> | ||
33 | 34 | ||
34 | #include <linux/mmc/host.h> | 35 | #include <linux/mmc/host.h> |
35 | #include <linux/mmc/mmc.h> /* for R1_SPI_* bit values */ | 36 | #include <linux/mmc/mmc.h> /* for R1_SPI_* bit values */ |