Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 336d6e509f59df38c9588f8597f72232e8837693..92129078d4f3946d7e0af5495df920cb88cb147a 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -917,7 +917,7 @@ typedef struct hwif_s {
        unsigned dma;
 
        void (*led_act)(void *data, int rw);
-} ide_hwif_t;
+} ____cacheline_maxaligned_in_smp ide_hwif_t;
 
 /*
  *  internal ide interrupt handler type