diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-03 12:59:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-03 12:59:38 +0200 |
| commit | d30a0d839a5a282e43353fee53d5dc70db5eceda (patch) | |
| tree | 189a91615be3174a9ff8b20937359d11298433af /arch/sparc/kernel/pci_impl.h | |
| parent | ALSA: emu10k1: Avoid access to invalid pages when period=1 (diff) | |
| parent | ALSA: isa: Move snd_legacy_find_free_ioport to initval.h (diff) | |
| download | linux-d30a0d839a5a282e43353fee53d5dc70db5eceda.tar.xz linux-d30a0d839a5a282e43353fee53d5dc70db5eceda.zip | |
Merge branch 'topic/next' into for-next
Diffstat (limited to 'arch/sparc/kernel/pci_impl.h')
| -rw-r--r-- | arch/sparc/kernel/pci_impl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h index 6beb60df31d0..918a2031c8bb 100644 --- a/arch/sparc/kernel/pci_impl.h +++ b/arch/sparc/kernel/pci_impl.h @@ -97,6 +97,7 @@ struct pci_pbm_info { /* PBM I/O and Memory space resources. */ struct resource io_space; struct resource mem_space; + struct resource busn; /* Base of PCI Config space, can be per-PBM or shared. */ unsigned long config_space; |