diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:09:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:09:24 -0700 |
| commit | 60efec8e05c9fb71841c7587c55345c4b79d1856 (patch) | |
| tree | dcc23d4f2dcf6da6445f3fc688e2a1ad29bc0351 /include | |
| parent | 79bd9937a72837bcc12db89d2d4fc62795227892 (diff) | |
| parent | 3dc527ecfb95dcb5760bd2b339323518496d53eb (diff) | |
| download | history-60efec8e05c9fb71841c7587c55345c4b79d1856.tar.gz | |
Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
into kernel.bkbits.net:/home/davem/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dvb/osd.h | 2 | ||||
| -rw-r--r-- | include/linux/dvb/video.h | 2 | ||||
| -rw-r--r-- | include/sound/info.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h index 5ccf27457e1b31..cdaff25eccc3f0 100644 --- a/include/linux/dvb/osd.h +++ b/include/linux/dvb/osd.h @@ -24,6 +24,8 @@ #ifndef _DVBOSD_H_ #define _DVBOSD_H_ +#include <linux/compiler.h> + typedef enum { // All functions return -2 on "not open" OSD_Close=1, // () diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index 8fb2eb33633610..2ed5d7bc4cbcfc 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h @@ -24,6 +24,8 @@ #ifndef _DVBVIDEO_H_ #define _DVBVIDEO_H_ +#include <linux/compiler.h> + #ifdef __KERNEL__ #include <linux/types.h> #else diff --git a/include/sound/info.h b/include/sound/info.h index 9e33b58b8cced3..29a6b83d1aeb6d 100644 --- a/include/sound/info.h +++ b/include/sound/info.h @@ -54,9 +54,11 @@ struct snd_info_entry_ops { int (*release) (snd_info_entry_t * entry, unsigned short mode, void *file_private_data); long (*read) (snd_info_entry_t *entry, void *file_private_data, - struct file * file, char __user *buf, long count); + struct file * file, char __user *buf, + unsigned long count, unsigned long pos); long (*write) (snd_info_entry_t *entry, void *file_private_data, - struct file * file, const char __user *buf, long count); + struct file * file, const char __user *buf, + unsigned long count, unsigned long pos); long long (*llseek) (snd_info_entry_t *entry, void *file_private_data, struct file * file, long long offset, int orig); unsigned int (*poll) (snd_info_entry_t *entry, void *file_private_data, |