diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /drivers/staging/wlags49_h2/wl_util.h | |
| parent | sh: Use __GFP_ZERO for dma_generic_alloc_coherent(). (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.tar.xz linux-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_util.h')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_util.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/wlags49_h2/wl_util.h b/drivers/staging/wlags49_h2/wl_util.h index 561e85b5c9b2..ba537a60059b 100644 --- a/drivers/staging/wlags49_h2/wl_util.h +++ b/drivers/staging/wlags49_h2/wl_util.h @@ -71,8 +71,6 @@ int is_valid_key_string( char *s ); void key_string2key( char *ks, KEY_STRCT *key ); -int hexdigit2int( char c ); - void wl_hcf_error( struct net_device *dev, int hcfStatus ); void wl_endian_translate_event( ltv_t *pLtv ); |