diff --git a/[refs] b/[refs] index 4cfa91fd9e1b..34a55c0ce555 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d1617b247aa63698618215a9f39ecf905d55779 +refs/heads/master: 681793711abca2b45f210a553962e2c4884b5587 diff --git a/trunk/arch/blackfin/kernel/bfin_gpio.c b/trunk/arch/blackfin/kernel/bfin_gpio.c index 72477c252a94..fcb2f6cf430b 100644 --- a/trunk/arch/blackfin/kernel/bfin_gpio.c +++ b/trunk/arch/blackfin/kernel/bfin_gpio.c @@ -941,7 +941,7 @@ int peripheral_request(unsigned short per, const char *label) EXPORT_SYMBOL(peripheral_request); #endif -int peripheral_request_list(unsigned short per[], const char *label) +int peripheral_request_list(const unsigned short per[], const char *label) { u16 cnt; int ret; @@ -994,7 +994,7 @@ void peripheral_free(unsigned short per) } EXPORT_SYMBOL(peripheral_free); -void peripheral_free_list(unsigned short per[]) +void peripheral_free_list(const unsigned short per[]) { u16 cnt; for (cnt = 0; per[cnt] != 0; cnt++) diff --git a/trunk/include/asm-blackfin/portmux.h b/trunk/include/asm-blackfin/portmux.h index 0d3f650d2d99..0807b286cd9e 100644 --- a/trunk/include/asm-blackfin/portmux.h +++ b/trunk/include/asm-blackfin/portmux.h @@ -17,8 +17,8 @@ int peripheral_request(unsigned short per, const char *label); void peripheral_free(unsigned short per); -int peripheral_request_list(unsigned short per[], const char *label); -void peripheral_free_list(unsigned short per[]); +int peripheral_request_list(const unsigned short per[], const char *label); +void peripheral_free_list(const unsigned short per[]); #include #include