diff --git a/[refs] b/[refs] index c39b31f4637d..e9ce82a0a511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 968181ca7e679be70bd50b82665e1f369a856ec7 +refs/heads/master: 09d1485649a46fda2c5f76b9c870d820d4d8d029 diff --git a/trunk/drivers/staging/dt3155/dt3155_isr.c b/trunk/drivers/staging/dt3155/dt3155_isr.c index 549186f41f27..1e91e6c54286 100644 --- a/trunk/drivers/staging/dt3155/dt3155_isr.c +++ b/trunk/drivers/staging/dt3155/dt3155_isr.c @@ -180,7 +180,7 @@ void printques(struct dt3155_fbuffer *fb) * the start address up to the beginning of the * next 4MB chunk (assuming bufsize < 4MB). *****************************************************/ -u32 adjust_4MB(u32 buf_addr, u32 bufsize) +static u32 adjust_4MB(u32 buf_addr, u32 bufsize) { if (((buf_addr+bufsize) & UPPER_10_BITS) != (buf_addr & UPPER_10_BITS)) return (buf_addr+bufsize) & UPPER_10_BITS; @@ -196,7 +196,7 @@ u32 adjust_4MB(u32 buf_addr, u32 bufsize) * buffers. If there is not enough free space * try for less memory. *****************************************************/ -void allocate_buffers(u32 *buf_addr, u32* total_size_kbs, +static void allocate_buffers(u32 *buf_addr, u32* total_size_kbs, u32 bufsize) { /* Compute the minimum amount of memory guaranteed to hold all