diff options
| -rw-r--r-- | drivers/ata/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/scsi/aacraid/commsup.c | 1 | ||||
| -rw-r--r-- | include/asm-frv/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 4 | ||||
| -rw-r--r-- | include/net/netlabel.h | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 6 | ||||
| -rw-r--r-- | sound/drivers/mts64.c | 2 | ||||
| -rw-r--r-- | sound/sparc/dbri.c | 6 |
8 files changed, 14 insertions, 10 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 5a8bdac5f5e8..99837d932f36 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -6,6 +6,8 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers" config ATA tristate "ATA device support" + depends on !(M32R || M68K) || BROKEN + depends on !SUN4 || BROKEN select SCSI ---help--- If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 8734a045558e..19e42ac07cb2 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -40,6 +40,7 @@ #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/kthread.h> +#include <linux/interrupt.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_device.h> diff --git a/include/asm-frv/libata-portmap.h b/include/asm-frv/libata-portmap.h new file mode 100644 index 000000000000..75484ef0c743 --- /dev/null +++ b/include/asm-frv/libata-portmap.h @@ -0,0 +1 @@ +#include <asm-generic/libata-portmap.h> diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 739a98eebe2c..04319a76103a 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -390,13 +390,13 @@ extern int xt_compat_match_offset(struct xt_match *match); extern void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, int *size); extern int xt_compat_match_to_user(struct xt_entry_match *m, - void * __user *dstptr, int *size); + void __user **dstptr, int *size); extern int xt_compat_target_offset(struct xt_target *target); extern void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, int *size); extern int xt_compat_target_to_user(struct xt_entry_target *t, - void * __user *dstptr, int *size); + void __user **dstptr, int *size); #endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ diff --git a/include/net/netlabel.h b/include/net/netlabel.h index fc2b72fc7e07..dd5780b36919 100644 --- a/include/net/netlabel.h +++ b/include/net/netlabel.h @@ -108,7 +108,7 @@ */ static inline struct sk_buff *netlbl_netlink_alloc_skb(size_t head, size_t body, - int gfp_flags) + gfp_t gfp_flags) { struct sk_buff *skb; diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 800067d69a9a..78a44b01c035 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -1364,15 +1364,15 @@ struct compat_ipt_replace { }; static inline int compat_copy_match_to_user(struct ipt_entry_match *m, - void * __user *dstptr, compat_uint_t *size) + void __user **dstptr, compat_uint_t *size) { return xt_compat_match_to_user(m, dstptr, size); } static int compat_copy_entry_to_user(struct ipt_entry *e, - void * __user *dstptr, compat_uint_t *size) + void __user **dstptr, compat_uint_t *size) { - struct ipt_entry_target __user *t; + struct ipt_entry_target *t; struct compat_ipt_entry __user *ce; u_int16_t target_offset, next_offset; compat_uint_t origsize; diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index 169987302ae4..ab8d4effcf9e 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -677,7 +677,7 @@ static int __devinit snd_mts64_ctl_create(struct snd_card *card, &mts64_ctl_smpte_time_seconds, &mts64_ctl_smpte_time_frames, &mts64_ctl_smpte_fps, - 0 }; + NULL }; for (i = 0; control[i]; ++i) { err = snd_ctl_add(card, snd_ctl_new1(control[i], mts)); diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index e4935fca12df..8016541ec16d 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -669,7 +669,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len) else printk(KERN_ERR "DBRI: no space for commands."); - return 0; + return NULL; } /* @@ -2037,10 +2037,10 @@ static int snd_dbri_open(struct snd_pcm_substream *substream) spin_unlock_irqrestore(&dbri->lock, flags); snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_CHANNELS, - snd_hw_rule_format, 0, SNDRV_PCM_HW_PARAM_FORMAT, + snd_hw_rule_format, NULL, SNDRV_PCM_HW_PARAM_FORMAT, -1); snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_FORMAT, - snd_hw_rule_channels, 0, + snd_hw_rule_channels, NULL, SNDRV_PCM_HW_PARAM_CHANNELS, -1); |