hw: Trim superfluous #include "block_int.h"

Including it in device models is unclean, including it without a
reason adds insult to injury.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/hw/fdc.c b/hw/fdc.c
index edade2bf92ba59c83910aae196fe924d1c69cf0d..57eda0c722319d79d6b3b97aaf2a5e279449f642 100644 (file)
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -36,7 +36,6 @@
 #include "qdev-addr.h"
 #include "blockdev.h"
 #include "sysemu.h"
-#include "block_int.h"
 
 /********************************************************/
 /* debug Floppy devices */

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 4d91e2c6429ea6b66b1c63b2bf0deed15919f117..5fe98b1bb37bda06bcc8eeaec9ad1233bb5b182b 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -27,7 +27,6 @@
 #include <hw/pci.h>
 #include <hw/isa.h>
 #include "block.h"
-#include "block_int.h"
 #include "sysemu.h"
 #include "dma.h"
 

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 5278bc4d6cbd8d7939f19b7113a84259ebcdd60b..0327d0ee72e78a7465c94a3597291f87ab0051d3 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -66,7 +66,6 @@
 #include <hw/pci.h>
 #include <hw/isa.h>
 #include "block.h"
-#include "block_int.h"
 #include "dma.h"
 
 #include <hw/ide/pci.h>

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 4ac745324cdf70d3da555cdd1d6bb29eb2992821..28b69d2cc34ffd028fdb5f7d4a26bd458149a161 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -26,7 +26,6 @@
 #include <hw/pc.h>
 #include <hw/isa.h>
 #include "block.h"
-#include "block_int.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index fdf5d75082aea000d0a89ec6be002c6f36e78315..c1844cb738baa3e011aee30e476dcfa55dd7442f 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -26,7 +26,6 @@
 #include <hw/ppc_mac.h>
 #include <hw/mac_dbdma.h>
 #include "block.h"
-#include "block_int.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 91c0e3c89d23c40a204e48c48ceb3ac86ec69087..9eee5b50ba9c6136e75ca6102de0a36ade58c2b7 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -26,7 +26,6 @@
 #include <hw/pc.h>
 #include <hw/pcmcia.h>
 #include "block.h"
-#include "block_int.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 132b7517ba5cd2cf7723709c4be10f0025f6e59b..2ec21b01632114afcc071695c74895b9fc95b085 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -24,7 +24,6 @@
  */
 #include <hw/hw.h>
 #include "block.h"
-#include "block_int.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index d1a14d7cc1cbaddb6f6627dfaeebe49f80f027c5..9fded02954acd2e88cbb2121af29ffa1662d6767 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -27,7 +27,6 @@
 #include <hw/pci.h>
 #include <hw/isa.h>
 #include "block.h"
-#include "block_int.h"
 #include "dma.h"
 
 #include <hw/ide/pci.h>

diff --git a/hw/ide/via.c b/hw/ide/via.c
index c0b9d43827158636f3016201bff7979f70052e4f..dab8a39f57abd3c8bda61f6917e06c599fb7f9f6 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -28,7 +28,6 @@
 #include <hw/pci.h>
 #include <hw/isa.h>
 #include "block.h"
-#include "block_int.h"
 #include "sysemu.h"
 #include "dma.h"
 

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index ac284e96098143ae22c7c97fa110ecd85e9c54a0..dbb3bdf2ceb07b071bb0f053af9518a64cbde073 100644 (file)
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -15,7 +15,6 @@
 #include "hw.h"
 #include "pci.h"
 #include "scsi.h"
-#include "block_int.h"
 
 //#define DEBUG_LSI
 //#define DEBUG_LSI_REG