diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 00:37:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 00:37:55 -0700 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/isdn/i4l/isdn_v110.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
| download | op-kernel-dev-577f99c1d08cf9cbdafd4e858dd13ff04d855090.zip op-kernel-dev-577f99c1d08cf9cbdafd4e858dd13ff04d855090.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/isdn/i4l/isdn_v110.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_v110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c index 5484d3c..c5d02b6 100644 --- a/drivers/isdn/i4l/isdn_v110.c +++ b/drivers/isdn/i4l/isdn_v110.c @@ -62,7 +62,7 @@ static unsigned char V110_OffMatrix_38400[] = * and to 67452301 when keylen = 2. This is necessary because ordering on * the isdn line is the other way. */ -static __inline unsigned char +static inline unsigned char FlipBits(unsigned char c, int keylen) { unsigned char b = c; |
