Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75d73126 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc-agp: fix missing slab.h include
parents b77d643c 6a915c2b

drivers/char/agp/parisc-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/klist.h>

#include <linux/agp_backend.h>

#include <linux/log2.h>

#include <linux/slab.h>



#include <asm/parisc-device.h>

#include <asm/ropes.h>