Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
8cd8647b
Commit
8cd8647b
authored
May 27, 2003
by
Dave Jones
Browse files
Options
Browse Files
Download
Plain Diff
Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart
parents
6e9445e6
ce8e7fee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
8 deletions
+2
-8
drivers/video/i810/i810.h
drivers/video/i810/i810.h
+2
-2
drivers/video/i810/i810_main.c
drivers/video/i810/i810_main.c
+0
-5
drivers/video/i810/i810_main.h
drivers/video/i810/i810_main.h
+0
-1
No files found.
drivers/video/i810/i810.h
View file @
8cd8647b
...
...
@@ -203,8 +203,8 @@
#define LOCKUP 8
struct
gtt_data
{
agp_memory
*
i810_fb_memory
;
agp_memory
*
i810_cursor_memory
;
struct
agp_memory
*
i810_fb_memory
;
struct
agp_memory
*
i810_cursor_memory
;
};
struct
mode_registers
{
...
...
drivers/video/i810/i810_main.c
View file @
8cd8647b
...
...
@@ -1926,11 +1926,6 @@ static void __exit i810fb_remove_pci(struct pci_dev *dev)
#ifndef MODULE
int
__init
i810fb_init
(
void
)
{
if
(
agp_init
())
{
printk
(
"i810fb_init: cannot initialize agpgart
\n
"
);
return
-
ENODEV
;
}
if
(
agp_intel_init
())
{
printk
(
"i810fb_init: cannot initialize intel agpgart
\n
"
);
return
-
ENODEV
;
...
...
drivers/video/i810/i810_main.h
View file @
8cd8647b
...
...
@@ -111,7 +111,6 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
/* Initialization */
static
void
i810fb_release_resource
(
struct
fb_info
*
info
,
struct
i810fb_par
*
par
);
extern
int
__init
agp_intel_init
(
void
);
extern
int
__init
agp_init
(
void
);
/* Video Timings */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment