diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-06-12 08:32:13 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-16 17:57:49 -0500 |
| commit | b219108cbacee5f2eaeca63cba013688eeba3bd4 (patch) | |
| tree | 656039a1d7a4db0605562c5290056a21d98865be /include | |
| parent | 00262986ceeb5c3358b70491aa898906503a0fe7 (diff) | |
| download | linux-stable-b219108cbacee5f2eaeca63cba013688eeba3bd4.tar.gz linux-stable-b219108cbacee5f2eaeca63cba013688eeba3bd4.tar.bz2 linux-stable-b219108cbacee5f2eaeca63cba013688eeba3bd4.zip | |
fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING code
Now that arch/ppc is gone we always define CONFIG_PPC_CPM_NEW_BINDING so
we can remove all the code associated with !CONFIG_PPC_CPM_NEW_BINDING.
Also fixed some asm/of_platform.h to linux/of_platform.h (and of_device.h)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs_enet_pd.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h index 9bc045b8c478..0ba21ee0f58c 100644 --- a/include/linux/fs_enet_pd.h +++ b/include/linux/fs_enet_pd.h @@ -135,11 +135,7 @@ struct fs_platform_info { u32 device_flags; int phy_addr; /* the phy address (-1 no phy) */ -#ifdef CONFIG_PPC_CPM_NEW_BINDING char bus_id[16]; -#else - const char* bus_id; -#endif int phy_irq; /* the phy irq (if it exists) */ const struct fs_mii_bus_info *bus_info; |