From: Len Brown <len.brown@intel.com>
Date: Sat, 16 Dec 2006 05:45:07 +0000 (-0500)
Subject: Pull trivial into test branch
X-Git-Tag: v2.6.20-rc2~6^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc;p=~emulex%2Finfiniband.git

Pull trivial into test branch

Conflicts:

	drivers/acpi/ec.c
---

463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc
diff --cc drivers/acpi/ec.c
index d713f769b72,7aa600794ae..4a909bfb805
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -367,9 -369,9 +367,9 @@@ int ec_write(u8 addr, u8 val
  
  EXPORT_SYMBOL(ec_write);
  
- extern int ec_transaction(u8 command,
+ int ec_transaction(u8 command,
 -                          const u8 *wdata, unsigned wdata_len,
 -                          u8 *rdata, unsigned rdata_len)
 +			  const u8 * wdata, unsigned wdata_len,
 +			  u8 * rdata, unsigned rdata_len)
  {
  	struct acpi_ec *ec;