Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 91d294c6334e..62ff8c3dc2bb 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -69,8 +69,6 @@ struct seeprom_descriptor;
 #define FALSE 0
 #endif
 
-#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array))
-
 #define ALL_CHANNELS '\0'
 #define ALL_TARGETS_MASK 0xFFFF
 #define INITIATOR_WILDCARD      (~0)
@@ -233,6 +231,7 @@ typedef enum {
         AHC_TARGETMODE  = 0x20000,      /* Has tested target mode support */
         AHC_MULTIROLE   = 0x40000,      /* Space for two roles at a time */
         AHC_REMOVABLE   = 0x80000,      /* Hot-Swap supported */
+        AHC_HVD         = 0x100000,     /* HVD rather than SE */
         AHC_AIC7770_FE  = AHC_FENONE,
         /*
          * The real 7850 does not support Ultra modes, but there are