diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /include/video/neomagic.h | |
| parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'include/video/neomagic.h')
| -rw-r--r-- | include/video/neomagic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/video/neomagic.h b/include/video/neomagic.h index 38910da0ae59..08b663782956 100644 --- a/include/video/neomagic.h +++ b/include/video/neomagic.h | |||
| @@ -123,7 +123,6 @@ typedef volatile struct { | |||
| 123 | 123 | ||
| 124 | struct neofb_par { | 124 | struct neofb_par { |
| 125 | struct vgastate state; | 125 | struct vgastate state; |
| 126 | struct mutex open_lock; | ||
| 127 | unsigned int ref_count; | 126 | unsigned int ref_count; |
| 128 | 127 | ||
| 129 | unsigned char MiscOutReg; /* Misc */ | 128 | unsigned char MiscOutReg; /* Misc */ |