From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 17 Jul 2006 13:25:26 +0000 (-0400)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.19-rc1~32^2~138
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4bf311ddfbffe12d41ad1a3c311ab727db6f72cb;p=linux-2.6-omap-h63xx.git

Merge branch 'master'
---

4bf311ddfbffe12d41ad1a3c311ab727db6f72cb
diff --cc include/linux/kernel.h
index c3958ea8d12,181c69cad4e..06c2768e133
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -32,8 -32,8 +32,9 @@@ extern const char linux_banner[]
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
  #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+ #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
  
  #define	KERN_EMERG	"<0>"	/* system is unusable			*/
  #define	KERN_ALERT	"<1>"	/* action must be taken immediately	*/