diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /arch/mips/loongson/lemote-2f | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'arch/mips/loongson/lemote-2f')
| -rw-r--r-- | arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/loongson/lemote-2f/ec_kb3310b.c b/arch/mips/loongson/lemote-2f/ec_kb3310b.c index 64057244eec5..2b666d3a3947 100644 --- a/arch/mips/loongson/lemote-2f/ec_kb3310b.c +++ b/arch/mips/loongson/lemote-2f/ec_kb3310b.c | |||
| @@ -45,8 +45,6 @@ void ec_write(unsigned short addr, unsigned char val) | |||
| 45 | /* flush the write action */ | 45 | /* flush the write action */ |
| 46 | inb(EC_IO_PORT_DATA); | 46 | inb(EC_IO_PORT_DATA); |
| 47 | spin_unlock_irqrestore(&index_access_lock, flags); | 47 | spin_unlock_irqrestore(&index_access_lock, flags); |
| 48 | |||
| 49 | return; | ||
| 50 | } | 48 | } |
| 51 | EXPORT_SYMBOL_GPL(ec_write); | 49 | EXPORT_SYMBOL_GPL(ec_write); |
| 52 | 50 | ||