diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 17:19:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 17:19:50 +0200 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /drivers/char/rio/cirrus.h | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | op-kernel-dev-eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0.zip op-kernel-dev-eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0.tar.gz | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/rio/cirrus.h')
| -rw-r--r-- | drivers/char/rio/cirrus.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/rio/cirrus.h b/drivers/char/rio/cirrus.h index a03a538..5ab5167 100644 --- a/drivers/char/rio/cirrus.h +++ b/drivers/char/rio/cirrus.h @@ -35,9 +35,6 @@ ***************************************************************************/ #ifndef _cirrus_h -#ifndef lint -/* static char* _cirrus_h_sccs = "@(#)cirrus.h 1.16"; */ -#endif #define _cirrus_h 1 /* Bit fields for particular registers shared with driver */ |
