diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/davinci_emac.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux/davinci_emac.h')
| -rw-r--r-- | include/linux/davinci_emac.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h index 5dd428532f79..542888504994 100644 --- a/include/linux/davinci_emac.h +++ b/include/linux/davinci_emac.h | |||
| @@ -36,6 +36,7 @@ struct emac_platform_data { | |||
| 36 | 36 | ||
| 37 | u8 rmii_en; | 37 | u8 rmii_en; |
| 38 | u8 version; | 38 | u8 version; |
| 39 | bool no_bd_ram; | ||
| 39 | void (*interrupt_enable) (void); | 40 | void (*interrupt_enable) (void); |
| 40 | void (*interrupt_disable) (void); | 41 | void (*interrupt_disable) (void); |
| 41 | }; | 42 | }; |