diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /drivers/uwb/address.c | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
| download | op-kernel-dev-923a789b49c7269a0245d5af6afe486188d940df.zip op-kernel-dev-923a789b49c7269a0245d5af6afe486188d940df.tar.gz | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'drivers/uwb/address.c')
| -rw-r--r-- | drivers/uwb/address.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/address.c b/drivers/uwb/address.c index 1664ae5..ad21b1d7 100644 --- a/drivers/uwb/address.c +++ b/drivers/uwb/address.c @@ -28,7 +28,7 @@ #include <linux/device.h> #include <linux/random.h> #include <linux/etherdevice.h> -#include <linux/uwb/debug.h> + #include "uwb-internal.h" |
