Merge ../linux-2.6

This commit is contained in:
Paul Mackerras 2005-11-02 15:20:55 +11:00
commit de2d3dbd17
241 changed files with 4337 additions and 1381 deletions

View file

@ -18,7 +18,7 @@
#define __ASM_PPC_SYS_H
#include <linux/init.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/types.h>
#if defined(CONFIG_8260)