[GFS2] Fix up merge of Linus' kernel into GFS2

This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Conflicts:

	include/linux/Kbuild
	include/linux/kernel.h

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/audit.c b/lib/audit.c
index 8c21625ef9..3b1289fadf 100644
--- a/lib/audit.c
+++ b/lib/audit.c
@@ -28,8 +28,10 @@ int audit_classify_syscall(int abi, unsigned syscall)
         switch(syscall) {
         case __NR_open:
                 return 2;
+#ifdef __NR_openat
         case __NR_openat:
                 return 3;
+#endif
 #ifdef __NR_socketcall
         case __NR_socketcall:
                 return 4;