summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-10-09 22:54:02 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-10-09 22:54:02 -0400
commit7c29e03bd5470f2b77dd5884503a69ebf96aa1b3 (patch)
tree14373bd0945f48ae19513c6814355a80fd260d65
parentb529225243ecb9874c85becd69a7abba586ed7d6 (diff)
downloadlongterm-queue-2.6.34-7c29e03bd5470f2b77dd5884503a69ebf96aa1b3.tar.gz
e1000 patch; e_err() is DPRINTK() in 2.6.34
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/e1000-fix-Tx-hangs-by-disabling-64-bit-DMA.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/queue/e1000-fix-Tx-hangs-by-disabling-64-bit-DMA.patch b/queue/e1000-fix-Tx-hangs-by-disabling-64-bit-DMA.patch
index bf083ec..d4dd6be 100644
--- a/queue/e1000-fix-Tx-hangs-by-disabling-64-bit-DMA.patch
+++ b/queue/e1000-fix-Tx-hangs-by-disabling-64-bit-DMA.patch
@@ -68,7 +68,7 @@ index 13e34d2..6039d7f 100644
+
+ /* identify the MAC */
+ if (e1000_set_mac_type(hw)) {
-+ e_err(probe, "Unknown MAC Type\n");
++ DPRINTK(PROBE, ERR, "Unknown MAC Type\n");
+ return -EIO;
+ }
+