diff --git a/[refs] b/[refs] index f71339c3bc02..20e02c9d1c0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91f68b7359144aa40bb9668124543d15284750b4 +refs/heads/master: be857df1dd8d8e1491e60d999caf3b8446ccd475 diff --git a/trunk/fs/ext3/namei.c b/trunk/fs/ext3/namei.c index 1dd2abe6313e..8d6f965e502c 100644 --- a/trunk/fs/ext3/namei.c +++ b/trunk/fs/ext3/namei.c @@ -74,10 +74,6 @@ static struct buffer_head *ext3_append(handle_t *handle, #define assert(test) J_ASSERT(test) #endif -#ifndef swap -#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0) -#endif - #ifdef DX_DEBUG #define dxtrace(command) command #else