From 117636092a87a28a013a4acb5de5492645ed620f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 23 Oct 2007 20:42:11 +0200 Subject: [PATCH] [PATCH] Fix breakage after SG cleanups Commits 58b053e4ce9d2fc3023645c1b96e537c72aa8d9a ("Update arch/ to use sg helpers") 45711f1af6eff1a6d010703b4862e0d2b9afd056 ("[SG] Update drivers to use sg helpers") fa05f1286be25a8ce915c5dd492aea61126b3f33 ("Update net/ to use sg helpers") converted many files to use the scatter gather helpers without ensuring that the necessary headerfile is included. This happened to work for ia64, powerpc, sparc64 and x86 because they happened to drag in that file via their . On most of the others this probably broke. Instead of increasing the header file spider web I choose to include directly into the affectes files. Signed-off-by: Ralf Baechle Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds --- drivers/block/DAC960.c | 1 + drivers/block/cpqarray.c | 1 + drivers/block/sx8.c | 1 + drivers/ieee1394/dma.c | 2 +- drivers/media/video/ivtv/ivtv-driver.h | 1 + drivers/media/video/videobuf-dma-sg.c | 1 + drivers/mmc/host/sdhci.c | 1 + drivers/usb/core/message.c | 2 +- include/media/saa7146.h | 1 + net/ieee80211/ieee80211_crypt_tkip.c | 1 + net/ieee80211/ieee80211_crypt_wep.c | 1 + net/mac80211/wep.c | 2 +- 12 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 53505422867c..9030c373ce67 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include "DAC960.h" diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index efab27fa1083..c8132d958795 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 282a69558e8a..52dc5e131718 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c index 25e113b50d86..3051e312fdc8 100644 --- a/drivers/ieee1394/dma.c +++ b/drivers/ieee1394/dma.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "dma.h" diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 3bda1df63cb6..49ce14d14a54 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index 0a18286279d3..9ab94a749d81 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 0db837e44b77..d7c5b94d8c58 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -13,6 +13,7 @@ #include #include #include +#include #include diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 90d64a808464..8bdaa157ffe7 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -11,9 +11,9 @@ #include #include #include +#include #include #include -#include #include "hcd.h" /* for usbcore internals */ #include "usb.h" diff --git a/include/media/saa7146.h b/include/media/saa7146.h index cd3ff2c29d5e..88b2b5a619aa 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -12,6 +12,7 @@ #include /* for accessing devices */ #include #include +#include #include /* for vmalloc() */ #include /* for vmalloc_to_page() */ diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index c796661a021b..811777682e2b 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c index 0af6103d715c..9693429489ed 100644 --- a/net/ieee80211/ieee80211_crypt_wep.c +++ b/net/ieee80211/ieee80211_crypt_wep.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index cc806d640f7a..a84a23310ff4 100644 --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "ieee80211_i.h" -- 2.20.1