diff options
author | Sage Weil | 2012-06-15 12:32:04 -0700 |
---|---|---|
committer | Sage Weil | 2012-06-15 12:32:04 -0700 |
commit | 9a64e8e0ace51b309fdcff4b4754b3649250382a (patch) | |
tree | 1f0d75c196c5ab0408c55ed6cf3a152f1f921e15 /lib/rational.c | |
parent | f3dea7edd3d449fe7a6d402c1ce56a294b985261 (diff) | |
parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) |
Merge tag 'v3.5-rc1'
Linux 3.5-rc1
Conflicts:
net/ceph/messenger.c
Diffstat (limited to 'lib/rational.c')
-rw-r--r-- | lib/rational.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rational.c b/lib/rational.c index 3ed247b80662..f0aa21c2a762 100644 --- a/lib/rational.c +++ b/lib/rational.c @@ -1,13 +1,14 @@ /* * rational fractions * - * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <os@emlix.com> + * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <oskar@scara.com> * * helper functions when coping with rational numbers */ #include <linux/rational.h> -#include <linux/module.h> +#include <linux/compiler.h> +#include <linux/export.h> /* * calculate best rational approximation for a given fraction |