Merge with /home/tmlind/src/kernel/linux-omap-2.6

diff --combined Makefile
index b8d3062cde41b7b81d0b3e93a76898667a71af14,eaf4a45f303c8cfa5bc053fef0216ff2fd3b3700..4a5e786edc188eb6f9ca242075c2420376ad51ec
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -11,7 -11,7 +11,7 @@@ NAME=Affluent Albatros
  # expect to learn how to build the kernel reading this file.
  
  # Add custom flags here to avoid conflict with updates
- EXTRAVERSION := $(EXTRAVERSION)-omap1
+ EXTRAVERSION := $(EXTRAVERSION)-omap2
  
  # Do not print "Entering directory ..."
  MAKEFLAGS += --no-print-directory
@@@ -338,7 -338,7 +338,7 @@@ KALLSYMS   = scripts/kallsym
  PERL          = perl
  CHECK         = sparse
  
 -CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ $(CF)
 +CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
  MODFLAGS      = -DMODULE
  CFLAGS_MODULE   = $(MODFLAGS)
  AFLAGS_MODULE   = $(MODFLAGS)
@@@ -350,8 -350,7 +350,8 @@@ AFLAGS_KERNEL      
  # Use LINUXINCLUDE when you must reference the include/ directory.
  # Needed to be compatible with the O= option
  LINUXINCLUDE    := -Iinclude \
 -                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include)
 +                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
 +                 -imacros include/linux/autoconf.h
  
  CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
@@@ -376,8 -375,8 +376,8 @@@ export MODVERDIR := $(if $(KBUILD_EXTMO
  
  # Files to ignore in find ... statements
  
 -RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o
 -export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg
 +RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
 +export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg --exclude .git
  
  # ===========================================================================
  # Rules shared between *config targets and build targets
@@@ -587,7 -586,7 +587,7 @@@ export MODLI
  
  
  ifeq ($(KBUILD_EXTMOD),)
 -core-y                += kernel/ mm/ fs/ ipc/ security/ crypto/
 +core-y                += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
  
  vmlinux-dirs  := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
@@@ -1254,6 -1253,11 +1254,6 @@@ tags: FORC
  # Scripts to check various things for consistency
  # ---------------------------------------------------------------------------
  
 -configcheck:
 -      find * $(RCS_FIND_IGNORE) \
 -              -name '*.[hcS]' -type f -print | sort \
 -              | xargs $(PERL) -w scripts/checkconfig.pl
 -
  includecheck:
        find * $(RCS_FIND_IGNORE) \
                -name '*.[hcS]' -type f -print | sort \