summaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorDavid Woodhouse2005-07-02 14:39:09 +0200
committerDavid Woodhouse2005-07-02 14:39:09 +0200
commitd2f6409584e2c62ffad81690562330ff3bf4a458 (patch)
tree3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/linux/ide.h
parentAUDIT: Use KERN_NOTICE for printk of audit records (diff)
parent[PATCH] alpha smp fix (part #2) (diff)
downloadkernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.gz
kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.xz
kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.zip
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 336d6e509f59..92129078d4f3 100644
--- 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