LINUX26_COPYTO:=/tftpboot
 
+ifeq   ($(DEFAULT_KERNEL_HEADERS),2.6.22.1)
+KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/linux/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+else
 # Patch during kernel header build
 ifeq ($(BR2_avr32),y)
-LINUX26_KERNEL_PATCH_DIR:=target/device/Atmel/arch-avr32/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-avr32/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
 endif
-
 # Patch during kernel build
 ifeq ($(BR2_arm),y)
 #LINUX26_PATCH_DIR:=target/device/Atmel/arch-at91/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
-LINUX26_KERNEL_PATCH_DIR:=target/device/Atmel/arch-at91/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-arm/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
+endif
 endif
-
 
 # The board specific Makefile.in can redefine BOARD_NAME's
 LINUX_BOARD_NAME:=$(BOARD_NAME)
        @echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)
        @echo LINUX_SOURCE=$(LINUX_SOURCE)
        @echo TARGETS=$(TARGETS)
+       @echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR)
 
 #TARGETS+=atmel_status
 endif