diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:09:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:09:33 -0700 |
| commit | 45432371b448c80622d8069b845625996127caeb (patch) | |
| tree | e2dff249fcf5fc653e475f6d210f6e95da2dbe54 /drivers/staging/sxg/sxgdbg.h | |
| parent | 92fb83afd6664a6f8a05f990d264c998f9b99f69 (diff) | |
| parent | 51b90540dd03f605122937a999e6d0430238c266 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (42 commits)
Staging: usbip: fix build warning on 64bit kernels
Staging: me4000: remove some compiler warnings
Staging: wbusb: fix a bunch of compiler warnings
Staging: w35und: module init cleanup
Staging: w35und: use gotos for error handling
Staging: w35und: remove spinlock wrappers
Staging: sxg: fix compiler warnings.
Staging: sxg: fix up unused function warnings
Staging: sxg: clean up C99 comments
Staging: Lindent the echo driver
Staging: SLICOSS: Free multicast list at driver exit
Staging: PCC-ACPI: Fix all checkpatch errors
Staging: pcc-acpi: update to latest version
Staging: Clean up sxg driver
Staging: remove remaining uses of __FUNCTION__
Staging: add poch driver
Staging: wlan-ng: fix build error if wireless networking is not enabled
Staging: echo: remove annoying "end of function" markers
Staging: echo: remove __cplusplus macro magic
Staging: echo: remove dead code
...
Diffstat (limited to 'drivers/staging/sxg/sxgdbg.h')
| -rw-r--r-- | drivers/staging/sxg/sxgdbg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/sxg/sxgdbg.h b/drivers/staging/sxg/sxgdbg.h index cfb6c7c77a9..4522b8d7149 100644 --- a/drivers/staging/sxg/sxgdbg.h +++ b/drivers/staging/sxg/sxgdbg.h @@ -58,7 +58,7 @@ { \ if (!(a)) { \ DBG_ERROR("ASSERT() Failure: file %s, function %s line %d\n",\ - __FILE__, __FUNCTION__, __LINE__); \ + __FILE__, __func__, __LINE__); \ } \ } #endif |