Author: tbm
Date: Mon May 21 11:27:55 2007
New Revision: 8635
Log:
fix patch
Modified:
dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx_npe_driver-0.3.1.patch
Modified:
dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx_npe_driver-0.3.1.patch
==============================================================================
---
dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx_npe_driver-0.3.1.patch
(original)
+++
dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx_npe_driver-0.3.1.patch
Mon May 21 11:27:55 2007
@@ -4141,10 +4141,8 @@
+
+EXPORT_SYMBOL(get_npe_by_id);
+EXPORT_SYMBOL(return_npe_dev);
-diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
-index 9444958..2b4751c 100644
---- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
-+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-05-21
11:18:46.000000000 +0000
++++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-05-21
11:20:48.000000000 +0000
@@ -22,6 +22,8 @@
#ifndef _ASM_ARM_IXP4XX_H_
#define _ASM_ARM_IXP4XX_H_
@@ -4195,11 +4193,10 @@
/*
* PCI register values and bit definitions
-@@ -607,6 +627,34 @@
+@@ -607,4 +627,43 @@
#define DCMD_LENGTH 0x01fff /* length mask (max = 8K - 1) */
-+
+/* Fuse Bits of IXP_EXP_CFG2 */
+#define IX_FUSE_RCOMP (1 << 0)
+#define IX_FUSE_USB (1 << 1)
@@ -4227,13 +4224,7 @@
+#define IX_FUSE_IXP46X_ONLY IX_FUSE_XSCALE_MAX_FREQ | IX_FUSE_RSA | \
+ IX_FUSE_NPEB_ETH | IX_FUSE_NPEA_ETH | IX_FUSE_USB_HOST | IX_FUSE_ECC
+
- #ifndef __ASSEMBLY__
- static inline int cpu_is_ixp46x(void)
- {
-@@ -620,6 +668,15 @@ static inline int cpu_is_ixp46x(void)
- #endif
- return 0;
- }
++#ifndef __ASSEMBLY__
+
+static inline u32 ix_fuse(void)
+{
@@ -4243,8 +4234,8 @@
+
+ return fuses;
+}
- #endif
-
++#endif
++
#endif
diff --git a/include/asm-arm/arch-ixp4xx/npe_regs.h
b/include/asm-arm/arch-ixp4xx/npe_regs.h
new file mode 100644
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
