diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 12:10:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 12:10:50 +0200 |
| commit | 35780c8ea7ad5c6d5483244d5f5bf37176fda86a (patch) | |
| tree | 2bc34969f558da2a9b3de915e3f2499a959085da /drivers/scsi/megaraid/mega_common.h | |
| parent | 6ce37a58e334ef773f88283939afc9f4965c7697 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | linux-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.tar.gz linux-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.tar.bz2 linux-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.zip | |
Merge commit 'v2.6.27-rc1' into x86/urgent
Diffstat (limited to 'drivers/scsi/megaraid/mega_common.h')
| -rw-r--r-- | drivers/scsi/megaraid/mega_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h index f62ed468ada0..5ead1283a844 100644 --- a/drivers/scsi/megaraid/mega_common.h +++ b/drivers/scsi/megaraid/mega_common.h @@ -265,7 +265,7 @@ typedef struct { #define ASSERT(expression) \ if (!(expression)) { \ ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \ - #expression, __FILE__, __LINE__, __FUNCTION__); \ + #expression, __FILE__, __LINE__, __func__); \ } #else #define ASSERT(expression) |