diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 19:16:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 19:16:07 +0200 |
| commit | 72c1c2f1be6b6574c434bd60991269786c2431a2 (patch) | |
| tree | c86e89ccb964607b906be98dbc3a01b86dcb099a /drivers/block | |
| parent | Merge tag 'metag-fixes-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | xilinx systemace: Fix sparse warnings (diff) | |
| download | linux-72c1c2f1be6b6574c434bd60991269786c2431a2.tar.xz linux-72c1c2f1be6b6574c434bd60991269786c2431a2.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"This Microblaze merge window is quite minimal.
I have also added to my branch one xilinx systemace sparse fix because
haven't got any reply from block maintainer."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
xilinx systemace: Fix sparse warnings
microblaze: Move __NR_syscalls from uapi
microblaze: Enable KGDB in defconfig
microblaze: Don't mark arch_kgdb_ops as const.
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/xsysace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 3fd130fdfbc1..1393b8871a28 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c @@ -407,7 +407,7 @@ static void ace_dump_regs(struct ace_device *ace) ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT)); } -void ace_fix_driveid(u16 *id) +static void ace_fix_driveid(u16 *id) { #if defined(__BIG_ENDIAN) int i; @@ -463,7 +463,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace) } /* Get the next read/write request; ending requests that we don't handle */ -struct request *ace_get_next_request(struct request_queue * q) +static struct request *ace_get_next_request(struct request_queue *q) { struct request *req; |