debian/changelog: Set version to 2.6.27~rc3-1~experimental.1.
debian/patches/features/arm/5281d0.patch, debian/patches/features/arm/orion_watchdog.patch: Fix. svn path=/dists/trunk/linux-2.6/; revision=12052
This commit is contained in:
parent
4ea038575e
commit
d7626e5dff
|
@ -1,4 +1,4 @@
|
|||
linux-2.6 (2.6.27~rc2-1~experimental.1) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.27~rc3-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
[ maximilian attems ]
|
||||
* New upstream release
|
||||
|
|
|
@ -35,8 +35,8 @@ index faf4e32..a7a6d79 100644
|
|||
/*
|
||||
diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/include/asm-arm/arch-orion5x/orion5x.h
|
||||
index 10257f5..15f07a4 100644
|
||||
--- a/include/asm-arm/arch-orion5x/orion5x.h
|
||||
+++ b/include/asm-arm/arch-orion5x/orion5x.h
|
||||
--- a/arch/arm/arch-orion5x/include/mach/orion5x.h
|
||||
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
|
||||
@@ -73,6 +73,7 @@
|
||||
#define MV88F5182_REV_A2 2
|
||||
/* Orion-2 (88F5281) */
|
||||
|
|
|
@ -284,8 +284,8 @@ index 0000000..5cc1953
|
|||
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
||||
diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/include/asm-arm/arch-orion5x/orion5x.h
|
||||
index 10257f5..375da2e 100644
|
||||
--- a/include/asm-arm/arch-orion5x/orion5x.h~ 2008-07-26 00:33:55.000000000 +0000
|
||||
+++ b/include/asm-arm/arch-orion5x/orion5x.h 2008-07-26 00:33:58.000000000 +0000
|
||||
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h~ 2008-07-26 00:33:55.000000000 +0000
|
||||
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h 2008-07-26 00:33:58.000000000 +0000
|
||||
@@ -151,9 +151,11 @@
|
||||
#define CPU_CONF ORION5X_BRIDGE_REG(0x100)
|
||||
#define CPU_CTRL ORION5X_BRIDGE_REG(0x104)
|
||||
|
|
Loading…
Reference in New Issue