Browse Source

copied the ppc horizen fix from linux24 to linux26

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1640 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
d672f580d6
2 changed files with 34 additions and 0 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +33
    -0
      package/base/linux26/arch-ppc-horizon-name-clash.patch

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -2,6 +2,7 @@
*) 2003-10-27 (2.0.0-rc2 - 2.0.0-rc3)
- updated cpufreqd (now includes my PMU work)
- copied the ppc horizen fix from linux24 to linux26
*) 2003-10-26 (2.0.0-rc2 - 2.0.0-rc3)

+ 33
- 0
package/base/linux26/arch-ppc-horizon-name-clash.patch

@ -0,0 +1,33 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/linux24/arch-ppc-horizon-name-clash.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./drivers/atm/horizon.c.orig 2003-09-04 20:22:19.000000000 +0200
+++ ./drivers/atm/horizon.c 2003-09-04 20:24:36.000000000 +0200
@@ -481,7 +481,7 @@
return;
}
-static inline void dump_regs (hrz_dev * dev) {
+static inline void dump_horizon_regs (hrz_dev * dev) {
#ifdef DEBUG_HORIZON
PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG));
PRINTD (DBG_REGS, "RX CONFIG: %#x", rd_regw (dev, RX_CONFIG_OFF));

Loading…
Cancel
Save