diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /drivers/net/skfp/smt.c | |
| parent | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'drivers/net/skfp/smt.c')
| -rw-r--r-- | drivers/net/skfp/smt.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c index 805383b33d3..83d16fecfac 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/skfp/smt.c @@ -55,16 +55,6 @@ static const struct fddi_addr SMT_Unknown = { } ; /* - * external variables - */ -extern const struct fddi_addr fddi_broadcast ; - -/* - * external functions - */ -int pcm_status_twisted(struct s_smc *smc); - -/* * function prototypes */ #ifdef LITTLE_ENDIAN |