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
2022f446
Commit
2022f446
authored
Nov 17, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/acme/BK/includes-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
2cdd5908
0fc7b221
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
include/linux/ncp_fs_sb.h
include/linux/ncp_fs_sb.h
+2
-0
sound/drivers/mtpav.c
sound/drivers/mtpav.c
+3
-1
No files found.
include/linux/ncp_fs_sb.h
View file @
2022f446
...
...
@@ -18,6 +18,8 @@
#define NCP_DEFAULT_OPTIONS 0
/* 2 for packet signatures */
struct
sock
;
struct
ncp_server
{
struct
ncp_mount_data_kernel
m
;
/* Nearly all of the mount data is of
...
...
sound/drivers/mtpav.c
View file @
2022f446
...
...
@@ -51,8 +51,8 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/ioport.h>
#include <sound/core.h>
...
...
@@ -61,6 +61,8 @@
#include <sound/rawmidi.h>
#include <linux/delay.h>
#include <asm/io.h>
/*
* globals
*/
...
...
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