diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /drivers/isdn | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/gigaset/ser-gigaset.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index ac245e7e96a5..3071a52467ed 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
| @@ -389,8 +389,7 @@ static void gigaset_freecshw(struct cardstate *cs) | |||
| 389 | 389 | ||
| 390 | static void gigaset_device_release(struct device *dev) | 390 | static void gigaset_device_release(struct device *dev) |
| 391 | { | 391 | { |
| 392 | struct platform_device *pdev = | 392 | struct platform_device *pdev = to_platform_device(dev); |
| 393 | container_of(dev, struct platform_device, dev); | ||
| 394 | 393 | ||
| 395 | /* adapted from platform_device_release() in drivers/base/platform.c */ | 394 | /* adapted from platform_device_release() in drivers/base/platform.c */ |
| 396 | //FIXME is this actually necessary? | 395 | //FIXME is this actually necessary? |