diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/irda/via-ircc.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/irda/via-ircc.h')
| -rw-r--r-- | drivers/net/irda/via-ircc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h index 5a84822b5a43..c6f58482b769 100644 --- a/drivers/net/irda/via-ircc.h +++ b/drivers/net/irda/via-ircc.h | |||
| @@ -238,7 +238,7 @@ static void WriteLPCReg(int iRegNum, unsigned char iVal) | |||
| 238 | 238 | ||
| 239 | static __u8 ReadReg(unsigned int BaseAddr, int iRegNum) | 239 | static __u8 ReadReg(unsigned int BaseAddr, int iRegNum) |
| 240 | { | 240 | { |
| 241 | return ((__u8) inb(BaseAddr + iRegNum)); | 241 | return (__u8) inb(BaseAddr + iRegNum); |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | static void WriteReg(unsigned int BaseAddr, int iRegNum, unsigned char iVal) | 244 | static void WriteReg(unsigned int BaseAddr, int iRegNum, unsigned char iVal) |