From 4f860245a9fd41d35765a0f369ee34a499dc627d Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Mon, 10 Jan 2011 11:05:09 -0500
Subject: Branch for 2.6.38

- Rebase trivial patches.
- Switch debug configs back on.
- config changes:
  DEBUG_SET_MODULE_RONX=y
  B43_PHY_N=y
  RT2800USB_RT33XX=y |
  RT2800PCI_RT33XX=y | experimental
  WL12XX=m
  RTL8192CE=m
  CAN_SLCAN=m
  SCHED_AUTOGROUP=n
---
 linux-2.6-silence-noise.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-2.6-silence-noise.patch')

diff --git a/linux-2.6-silence-noise.patch b/linux-2.6-silence-noise.patch
index 119a97769..ebd58195b 100644
--- a/linux-2.6-silence-noise.patch
+++ b/linux-2.6-silence-noise.patch
@@ -31,7 +31,7 @@ index 170f71e..4f3e632 100644
  static int i8042_controller_check(void)
  {
 -	if (i8042_flush() == I8042_BUFFER_SIZE) {
--		printk(KERN_ERR "i8042.c: No controller found.\n");
+-		pr_err("No controller found\n");
 +	if (i8042_flush() == I8042_BUFFER_SIZE)
  		return -ENODEV;
 -	}
-- 
cgit