ChangeSet 1.2231.1.165, 2005/03/28 20:02:19-08:00, [EMAIL PROTECTED]
[PATCH] alpha build fixes
Needed this to build Fedora rawhide kernel (2.6.12-rc1 + some patches)
on
alpha. This is the upstream portion of the build fixes.
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
drivers/char/agp/generic.c | 1 +
drivers/char/tpm/tpm.h | 1 +
include/asm-alpha/pci.h | 6 ++++++
include/linux/debugfs.h | 2 ++
4 files changed, 10 insertions(+)
diff -Nru a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
--- a/drivers/char/agp/generic.c 2005-03-28 21:42:55 -08:00
+++ b/drivers/char/agp/generic.c 2005-03-28 21:42:55 -08:00
@@ -36,6 +36,7 @@
#include <linux/pm.h>
#include <linux/agp_backend.h>
#include <linux/vmalloc.h>
+#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <asm/io.h>
#include <asm/cacheflush.h>
diff -Nru a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
--- a/drivers/char/tpm/tpm.h 2005-03-28 21:42:55 -08:00
+++ b/drivers/char/tpm/tpm.h 2005-03-28 21:42:55 -08:00
@@ -22,6 +22,7 @@
#include <linux/version.h>
#include <linux/pci.h>
#include <linux/delay.h>
+#include <linux/fs.h>
#include <linux/miscdevice.h>
#define TPM_TIMEOUT msecs_to_jiffies(5)
diff -Nru a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
--- a/include/asm-alpha/pci.h 2005-03-28 21:42:55 -08:00
+++ b/include/asm-alpha/pci.h 2005-03-28 21:42:55 -08:00
@@ -223,6 +223,12 @@
/* Nothing to do. */
}
+/* TODO: integrate with include/asm-generic/pci.h ? */
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+ return channel ? 15 : 14;
+}
+
extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *,
struct resource *);
diff -Nru a/include/linux/debugfs.h b/include/linux/debugfs.h
--- a/include/linux/debugfs.h 2005-03-28 21:42:55 -08:00
+++ b/include/linux/debugfs.h 2005-03-28 21:42:55 -08:00
@@ -15,6 +15,8 @@
#ifndef _DEBUGFS_H_
#define _DEBUGFS_H_
+#include <linux/fs.h>
+
#if defined(CONFIG_DEBUG_FS)
struct dentry *debugfs_create_file(const char *name, mode_t mode,
struct dentry *parent, void *data,
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
