Merge git://git.infradead.org/~dwmw2/khdrs-2.6

* git://git.infradead.org/~dwmw2/khdrs-2.6:
  Don't remove $(INSTALL_HDR_PATH)/install before headers_install.

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 5a8bdac5f5e839fd69310a5f93c4b162b11ed7c5..99837d932f367f29ad0f520095defd63336ce179 100644 (file)
--- 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 8734a045558e1573d2459015a4dbd4f2c5b65b04..19e42ac07cb228dd09dc771ec9a85f6513f877fd 100644 (file)
--- 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 (file)
index 0000000..75484ef
--- /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 739a98eebe2c2c1f5b46cbbbeb6d19f3731ea91f..04319a76103aca92fa0092b6d152a61bb0d1b514 100644 (file)
--- 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 fc2b72fc7e0774abe3fe8ced1db40cf2f59492f5..dd5780b36919fdfd9fda4dd7d85a786e40f3440b 100644 (file)
--- 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 800067d69a9ac8a421184a6f9c0abaf6d5453013..78a44b01c03516bf18aecd65b7191800c42da947 100644 (file)
--- 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 169987302ae41551573a67d5fb825239a41aad96..ab8d4effcf9ec55c58b5d0758dc67e4d07f9fc8f 100644 (file)
--- 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 e4935fca12dff57c88b3417ea154eb80cacbfe54..8016541ec16d7d766a1e035b061a7038dd95cd87 100644 (file)
--- 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);