X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=arch%2Fs390%2Finclude%2Fasm%2Fpci.h;h=b6bfa169a002c051649a2909281fe8c203a00ee7;hb=63e30271b04c712c684c07567401b61b10d094d4;hp=fdba308649d79fc4e1d3cfb3c9f4ba396067d293;hpb=c334f9c89e40d2c9f4598e87e186bf3264d39e51;p=cascardo%2Flinux.git

diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index fdba308649d7..b6bfa169a002 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -44,7 +44,7 @@ struct zpci_fmb {
 	u64 rpcit_ops;
 	u64 dma_rbytes;
 	u64 dma_wbytes;
-} __packed __aligned(16);
+} __packed __aligned(64);
 
 enum zpci_state {
 	ZPCI_FN_STATE_RESERVED,
@@ -65,7 +65,6 @@ struct s390_domain;
 
 /* Private data per function */
 struct zpci_dev {
-	struct pci_dev	*pdev;
 	struct pci_bus	*bus;
 	struct list_head entry;		/* list of all zpci_devices, needed for hotplug, etc. */
 
@@ -191,7 +190,7 @@ int zpci_fmb_disable_device(struct zpci_dev *);
 /* Debug */
 int zpci_debug_init(void);
 void zpci_debug_exit(void);
-void zpci_debug_init_device(struct zpci_dev *);
+void zpci_debug_init_device(struct zpci_dev *, const char *);
 void zpci_debug_exit_device(struct zpci_dev *);
 void zpci_debug_info(struct zpci_dev *, struct seq_file *);