aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 21:23:18 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 21:23:18 -0400
commitc2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch)
treef87e6b29248c45a92ec6b4b8ffe675bb52e6104b /arch
parentf3409f71a76838b1bc985f753eed787a3f17bc2c (diff)
parentc9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff)
Merge ../linux-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/common/locomo.c10
-rw-r--r--arch/arm/common/sa1111.c14
-rw-r--r--arch/arm/configs/eseries_pxa_defconfig1073
-rw-r--r--arch/arm/mach-at91/board-cap9adk.c6
-rw-r--r--[-rwxr-xr-x]arch/arm/mach-at91/board-yl-9200.c0
-rw-r--r--arch/arm/mach-at91/irq.c8
-rw-r--r--arch/arm/mach-ep93xx/core.c14
-rw-r--r--arch/arm/mach-imx/irq.c12
-rw-r--r--arch/arm/mach-ixp2000/core.c8
-rw-r--r--arch/arm/mach-ixp23xx/core.c10
-rw-r--r--arch/arm/mach-ixp23xx/roadrunner.c4
-rw-r--r--arch/arm/mach-ixp4xx/avila-pci.c8
-rw-r--r--arch/arm/mach-ixp4xx/common.c10
-rw-r--r--arch/arm/mach-ixp4xx/coyote-pci.c4
-rw-r--r--arch/arm/mach-ixp4xx/dsmg600-pci.c12
-rw-r--r--arch/arm/mach-ixp4xx/fsg-pci.c6
-rw-r--r--arch/arm/mach-ixp4xx/gateway7001-pci.c4
-rw-r--r--arch/arm/mach-ixp4xx/gtwx5715-pci.c8
-rw-r--r--arch/arm/mach-ixp4xx/ixdp425-pci.c8
-rw-r--r--arch/arm/mach-ixp4xx/ixdpg425-pci.c4
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-pci.c10
-rw-r--r--arch/arm/mach-ixp4xx/nslu2-pci.c6
-rw-r--r--arch/arm/mach-ixp4xx/wg302v2-pci.c4
-rw-r--r--arch/arm/mach-ks8695/irq.c10
-rw-r--r--arch/arm/mach-netx/generic.c8
-rw-r--r--arch/arm/mach-omap1/board-osk.c6
-rw-r--r--arch/arm/mach-omap1/board-palmz71.c4
-rw-r--r--arch/arm/mach-omap1/board-voiceblue.c8
-rw-r--r--arch/arm/mach-omap1/fpga.c2
-rw-r--r--arch/arm/mach-omap2/board-apollon.c6
-rw-r--r--arch/arm/mach-orion5x/db88f5281-setup.c4
-rw-r--r--arch/arm/mach-orion5x/irq.c12
-rw-r--r--arch/arm/mach-orion5x/rd88f5182-setup.c4
-rw-r--r--arch/arm/mach-orion5x/ts209-setup.c4
-rw-r--r--arch/arm/mach-pnx4008/irq.c10
-rw-r--r--arch/arm/mach-pxa/cm-x270-pci.c2
-rw-r--r--arch/arm/mach-pxa/lpd270.c2
-rw-r--r--arch/arm/mach-pxa/lubbock.c2
-rw-r--r--arch/arm/mach-pxa/mainstone.c2
-rw-r--r--arch/arm/mach-pxa/sharpsl_pm.c8
-rw-r--r--arch/arm/mach-pxa/trizeps4.c2
-rw-r--r--arch/arm/mach-sa1100/cerf.c2
-rw-r--r--arch/arm/mach-sa1100/h3600.c2
-rw-r--r--arch/arm/mach-sa1100/irq.c8
-rw-r--r--arch/arm/mach-sa1100/neponset.c2
-rw-r--r--arch/arm/mach-sa1100/pleb.c2
-rw-r--r--arch/arm/mm/fault-armv.c10
-rw-r--r--arch/arm/plat-mxc/gpio.c10
-rw-r--r--arch/arm/plat-omap/gpio.c28
-rw-r--r--arch/arm/plat-s3c24xx/Kconfig2
-rw-r--r--arch/arm/plat-s3c24xx/irq.c12
-rw-r--r--arch/x86/kernel/head_32.S8
54 files changed, 643 insertions, 790 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dabb015aa40b..c8f528284a94 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -314,7 +314,7 @@ config ARCH_IOP32X
314 select PLAT_IOP 314 select PLAT_IOP
315 select PCI 315 select PCI
316 select GENERIC_GPIO 316 select GENERIC_GPIO
317 select HAVE_GPIO_LIB 317 select ARCH_REQUIRE_GPIOLIB
318 help 318 help
319 Support for Intel's 80219 and IOP32X (XScale) family of 319 Support for Intel's 80219 and IOP32X (XScale) family of
320 processors. 320 processors.
@@ -325,7 +325,7 @@ config ARCH_IOP33X
325 select PLAT_IOP 325 select PLAT_IOP
326 select PCI 326 select PCI
327 select GENERIC_GPIO 327 select GENERIC_GPIO
328 select HAVE_GPIO_LIB 328 select ARCH_REQUIRE_GPIOLIB
329 help 329 help
330 Support for Intel's IOP33X (XScale) family of processors. 330 Support for Intel's IOP33X (XScale) family of processors.
331 331
@@ -418,7 +418,7 @@ config ARCH_MXC
418 select GENERIC_CLOCKEVENTS 418 select GENERIC_CLOCKEVENTS
419 select ARCH_MTD_XIP 419 select ARCH_MTD_XIP
420 select GENERIC_GPIO 420 select GENERIC_GPIO
421 select HAVE_GPIO_LIB 421 select ARCH_REQUIRE_GPIOLIB
422 help 422 help
423 Support for Freescale MXC/iMX-based family of processors 423 Support for Freescale MXC/iMX-based family of processors
424 424
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index b20995a82e04..2f0747744236 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -67,7 +67,7 @@ tune-$(CONFIG_CPU_ARM720T) :=-mtune=arm7tdmi
67tune-$(CONFIG_CPU_ARM740T) :=-mtune=arm7tdmi 67tune-$(CONFIG_CPU_ARM740T) :=-mtune=arm7tdmi
68tune-$(CONFIG_CPU_ARM9TDMI) :=-mtune=arm9tdmi 68tune-$(CONFIG_CPU_ARM9TDMI) :=-mtune=arm9tdmi
69tune-$(CONFIG_CPU_ARM940T) :=-mtune=arm9tdmi 69tune-$(CONFIG_CPU_ARM940T) :=-mtune=arm9tdmi
70tune-$(CONFIG_CPU_ARM946T) :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) 70tune-$(CONFIG_CPU_ARM946E) :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
71tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi 71tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi
72tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi 72tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi
73tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi 73tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index c3c3a3339049..85579654d3b7 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -331,17 +331,17 @@ static int locomo_gpio_type(unsigned int irq, unsigned int type)
331 331
332 mask = 1 << (irq - LOCOMO_IRQ_GPIO_START); 332 mask = 1 << (irq - LOCOMO_IRQ_GPIO_START);
333 333
334 if (type == IRQT_PROBE) { 334 if (type == IRQ_TYPE_PROBE) {
335 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask) 335 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
336 return 0; 336 return 0;
337 type = __IRQT_RISEDGE | __IRQT_FALEDGE; 337 type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
338 } 338 }
339 339
340 if (type & __IRQT_RISEDGE) 340 if (type & IRQ_TYPE_EDGE_RISING)
341 GPIO_IRQ_rising_edge |= mask; 341 GPIO_IRQ_rising_edge |= mask;
342 else 342 else
343 GPIO_IRQ_rising_edge &= ~mask; 343 GPIO_IRQ_rising_edge &= ~mask;
344 if (type & __IRQT_FALEDGE) 344 if (type & IRQ_TYPE_EDGE_FALLING)
345 GPIO_IRQ_falling_edge |= mask; 345 GPIO_IRQ_falling_edge |= mask;
346 else 346 else
347 GPIO_IRQ_falling_edge &= ~mask; 347 GPIO_IRQ_falling_edge &= ~mask;
@@ -473,7 +473,7 @@ static void locomo_setup_irq(struct locomo *lchip)
473 /* 473 /*
474 * Install handler for IRQ_LOCOMO_HW. 474 * Install handler for IRQ_LOCOMO_HW.
475 */ 475 */
476 set_irq_type(lchip->irq, IRQT_FALLING); 476 set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);
477 set_irq_chip_data(lchip->irq, irqbase); 477 set_irq_chip_data(lchip->irq, irqbase);
478 set_irq_chained_handler(lchip->irq, locomo_handler); 478 set_irq_chained_handler(lchip->irq, locomo_handler);
479 479
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 0a8e1ff2af8a..f6d3fdda7067 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -241,14 +241,14 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
241 void __iomem *mapbase = get_irq_chip_data(irq); 241 void __iomem *mapbase = get_irq_chip_data(irq);
242 unsigned long ip0; 242 unsigned long ip0;
243 243
244 if (flags == IRQT_PROBE) 244 if (flags == IRQ_TYPE_PROBE)
245 return 0; 245 return 0;
246 246
247 if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0) 247 if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)
248 return -EINVAL; 248 return -EINVAL;
249 249
250 ip0 = sa1111_readl(mapbase + SA1111_INTPOL0); 250 ip0 = sa1111_readl(mapbase + SA1111_INTPOL0);
251 if (flags & __IRQT_RISEDGE) 251 if (flags & IRQ_TYPE_EDGE_RISING)
252 ip0 &= ~mask; 252 ip0 &= ~mask;
253 else 253 else
254 ip0 |= mask; 254 ip0 |= mask;
@@ -338,14 +338,14 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
338 void __iomem *mapbase = get_irq_chip_data(irq); 338 void __iomem *mapbase = get_irq_chip_data(irq);
339 unsigned long ip1; 339 unsigned long ip1;
340 340
341 if (flags == IRQT_PROBE) 341 if (flags == IRQ_TYPE_PROBE)
342 return 0; 342 return 0;
343 343
344 if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0) 344 if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)
345 return -EINVAL; 345 return -EINVAL;
346 346
347 ip1 = sa1111_readl(mapbase + SA1111_INTPOL1); 347 ip1 = sa1111_readl(mapbase + SA1111_INTPOL1);
348 if (flags & __IRQT_RISEDGE) 348 if (flags & IRQ_TYPE_EDGE_RISING)
349 ip1 &= ~mask; 349 ip1 &= ~mask;
350 else 350 else
351 ip1 |= mask; 351 ip1 |= mask;
@@ -427,7 +427,7 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
427 /* 427 /*
428 * Register SA1111 interrupt 428 * Register SA1111 interrupt
429 */ 429 */
430 set_irq_type(sachip->irq, IRQT_RISING); 430 set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
431 set_irq_data(sachip->irq, irqbase); 431 set_irq_data(sachip->irq, irqbase);
432 set_irq_chained_handler(sachip->irq, sa1111_irq_handler); 432 set_irq_chained_handler(sachip->irq, sa1111_irq_handler);
433} 433}
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig
index 493ecee24f94..2307587a38a9 100644
--- a/arch/arm/configs/eseries_pxa_defconfig
+++ b/arch/arm/configs/eseries_pxa_defconfig
@@ -1,15 +1,19 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-hh17 3# Linux kernel version: 2.6.26
4# Fri Nov 9 20:23:03 2007 4# Sat Jul 26 22:28:46 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8CONFIG_GENERIC_GPIO=y 8CONFIG_GENERIC_GPIO=y
9CONFIG_GENERIC_TIME=y 9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y
10CONFIG_MMU=y 11CONFIG_MMU=y
11# CONFIG_NO_IOPORT is not set 12# CONFIG_NO_IOPORT is not set
12CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y
16CONFIG_LOCKDEP_SUPPORT=y
13CONFIG_TRACE_IRQFLAGS_SUPPORT=y 17CONFIG_TRACE_IRQFLAGS_SUPPORT=y
14CONFIG_HARDIRQS_SW_RESEND=y 18CONFIG_HARDIRQS_SW_RESEND=y
15CONFIG_GENERIC_IRQ_PROBE=y 19CONFIG_GENERIC_IRQ_PROBE=y
@@ -18,75 +22,90 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
18# CONFIG_ARCH_HAS_ILOG2_U64 is not set 22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
19CONFIG_GENERIC_HWEIGHT=y 23CONFIG_GENERIC_HWEIGHT=y
20CONFIG_GENERIC_CALIBRATE_DELAY=y 24CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_ARCH_SUPPORTS_AOUT=y
21CONFIG_ZONE_DMA=y 26CONFIG_ZONE_DMA=y
22CONFIG_ARCH_MTD_XIP=y 27CONFIG_ARCH_MTD_XIP=y
28CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
23CONFIG_VECTORS_BASE=0xffff0000 29CONFIG_VECTORS_BASE=0xffff0000
24CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
25 31
26# 32#
27# Code maturity level options 33# General setup
28# 34#
29CONFIG_EXPERIMENTAL=y 35CONFIG_EXPERIMENTAL=y
30CONFIG_BROKEN_ON_SMP=y 36CONFIG_BROKEN_ON_SMP=y
31CONFIG_INIT_ENV_ARG_LIMIT=32 37CONFIG_INIT_ENV_ARG_LIMIT=32
32
33#
34# General setup
35#
36CONFIG_LOCALVERSION="" 38CONFIG_LOCALVERSION=""
37CONFIG_LOCALVERSION_AUTO=y 39CONFIG_LOCALVERSION_AUTO=y
38CONFIG_SWAP=y 40CONFIG_SWAP=y
39CONFIG_SYSVIPC=y 41CONFIG_SYSVIPC=y
40# CONFIG_IPC_NS is not set
41CONFIG_SYSVIPC_SYSCTL=y 42CONFIG_SYSVIPC_SYSCTL=y
42# CONFIG_POSIX_MQUEUE is not set 43# CONFIG_POSIX_MQUEUE is not set
43# CONFIG_BSD_PROCESS_ACCT is not set 44# CONFIG_BSD_PROCESS_ACCT is not set
44# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
45# CONFIG_UTS_NS is not set
46# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
47# CONFIG_IKCONFIG is not set 47# CONFIG_IKCONFIG is not set
48CONFIG_LOG_BUF_SHIFT=14
49# CONFIG_CGROUPS is not set
50# CONFIG_GROUP_SCHED is not set
48CONFIG_SYSFS_DEPRECATED=y 51CONFIG_SYSFS_DEPRECATED=y
52CONFIG_SYSFS_DEPRECATED_V2=y
49# CONFIG_RELAY is not set 53# CONFIG_RELAY is not set
50CONFIG_BLK_DEV_INITRD=y 54# CONFIG_NAMESPACES is not set
51CONFIG_INITRAMFS_SOURCE="" 55# CONFIG_BLK_DEV_INITRD is not set
52# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 56# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
53CONFIG_SYSCTL=y 57CONFIG_SYSCTL=y
54CONFIG_EMBEDDED=y 58CONFIG_EMBEDDED=y
55CONFIG_UID16=y 59CONFIG_UID16=y
56CONFIG_SYSCTL_SYSCALL=y 60CONFIG_SYSCTL_SYSCALL=y
61CONFIG_SYSCTL_SYSCALL_CHECK=y
57# CONFIG_KALLSYMS is not set 62# CONFIG_KALLSYMS is not set
58CONFIG_HOTPLUG=y 63CONFIG_HOTPLUG=y
59CONFIG_PRINTK=y 64CONFIG_PRINTK=y
60CONFIG_BUG=y 65CONFIG_BUG=y
61CONFIG_ELF_CORE=y 66CONFIG_ELF_CORE=y
67CONFIG_COMPAT_BRK=y
62CONFIG_BASE_FULL=y 68CONFIG_BASE_FULL=y
63CONFIG_FUTEX=y 69CONFIG_FUTEX=y
70CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 71CONFIG_EPOLL=y
72CONFIG_SIGNALFD=y
73CONFIG_TIMERFD=y
74CONFIG_EVENTFD=y
65CONFIG_SHMEM=y 75CONFIG_SHMEM=y
66CONFIG_SLAB=y
67CONFIG_VM_EVENT_COUNTERS=y 76CONFIG_VM_EVENT_COUNTERS=y
77CONFIG_SLAB=y
78# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set
80# CONFIG_PROFILING is not set
81# CONFIG_MARKERS is not set
82CONFIG_HAVE_OPROFILE=y
83# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
84# CONFIG_HAVE_IOREMAP_PROT is not set
85CONFIG_HAVE_KPROBES=y
86CONFIG_HAVE_KRETPROBES=y
87# CONFIG_HAVE_ARCH_TRACEHOOK is not set
88# CONFIG_HAVE_DMA_ATTRS is not set
89# CONFIG_USE_GENERIC_SMP_HELPERS is not set
90CONFIG_HAVE_CLK=y
91CONFIG_PROC_PAGE_MONITOR=y
92CONFIG_SLABINFO=y
68CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
69# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
70CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
71# CONFIG_SLOB is not set
72
73#
74# Loadable module support
75#
76CONFIG_MODULES=y 96CONFIG_MODULES=y
97# CONFIG_MODULE_FORCE_LOAD is not set
77CONFIG_MODULE_UNLOAD=y 98CONFIG_MODULE_UNLOAD=y
78CONFIG_MODULE_FORCE_UNLOAD=y 99CONFIG_MODULE_FORCE_UNLOAD=y
79# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
80# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
81CONFIG_KMOD=y 102CONFIG_KMOD=y
82
83#
84# Block layer
85#
86CONFIG_BLOCK=y 103CONFIG_BLOCK=y
87# CONFIG_LBD is not set 104# CONFIG_LBD is not set
88# CONFIG_BLK_DEV_IO_TRACE is not set 105# CONFIG_BLK_DEV_IO_TRACE is not set
89# CONFIG_LSF is not set 106# CONFIG_LSF is not set
107# CONFIG_BLK_DEV_BSG is not set
108# CONFIG_BLK_DEV_INTEGRITY is not set
90 109
91# 110#
92# IO Schedulers 111# IO Schedulers
@@ -100,6 +119,7 @@ CONFIG_DEFAULT_AS=y
100# CONFIG_DEFAULT_CFQ is not set 119# CONFIG_DEFAULT_CFQ is not set
101# CONFIG_DEFAULT_NOOP is not set 120# CONFIG_DEFAULT_NOOP is not set
102CONFIG_DEFAULT_IOSCHED="anticipatory" 121CONFIG_DEFAULT_IOSCHED="anticipatory"
122CONFIG_CLASSIC_RCU=y
103 123
104# 124#
105# System Type 125# System Type
@@ -111,21 +131,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
111# CONFIG_ARCH_AT91 is not set 131# CONFIG_ARCH_AT91 is not set
112# CONFIG_ARCH_CLPS7500 is not set 132# CONFIG_ARCH_CLPS7500 is not set
113# CONFIG_ARCH_CLPS711X is not set 133# CONFIG_ARCH_CLPS711X is not set
114# CONFIG_ARCH_CO285 is not set
115# CONFIG_ARCH_EBSA110 is not set 134# CONFIG_ARCH_EBSA110 is not set
116# CONFIG_ARCH_EP93XX is not set 135# CONFIG_ARCH_EP93XX is not set
117# CONFIG_ARCH_FOOTBRIDGE is not set 136# CONFIG_ARCH_FOOTBRIDGE is not set
118# CONFIG_ARCH_NETX is not set 137# CONFIG_ARCH_NETX is not set
119# CONFIG_ARCH_H720X is not set 138# CONFIG_ARCH_H720X is not set
120# CONFIG_ARCH_IMX is not set 139# CONFIG_ARCH_IMX is not set
140# CONFIG_ARCH_IOP13XX is not set
121# CONFIG_ARCH_IOP32X is not set 141# CONFIG_ARCH_IOP32X is not set
122# CONFIG_ARCH_IOP33X is not set 142# CONFIG_ARCH_IOP33X is not set
123# CONFIG_ARCH_IOP13XX is not set
124# CONFIG_ARCH_IXP4XX is not set
125# CONFIG_ARCH_IXP2000 is not set
126# CONFIG_ARCH_IXP23XX is not set 143# CONFIG_ARCH_IXP23XX is not set
144# CONFIG_ARCH_IXP2000 is not set
145# CONFIG_ARCH_IXP4XX is not set
127# CONFIG_ARCH_L7200 is not set 146# CONFIG_ARCH_L7200 is not set
147# CONFIG_ARCH_KIRKWOOD is not set
148# CONFIG_ARCH_KS8695 is not set
128# CONFIG_ARCH_NS9XXX is not set 149# CONFIG_ARCH_NS9XXX is not set
150# CONFIG_ARCH_LOKI is not set
151# CONFIG_ARCH_MV78XX0 is not set
152# CONFIG_ARCH_MXC is not set
153# CONFIG_ARCH_ORION5X is not set
129# CONFIG_ARCH_PNX4008 is not set 154# CONFIG_ARCH_PNX4008 is not set
130CONFIG_ARCH_PXA=y 155CONFIG_ARCH_PXA=y
131# CONFIG_ARCH_RPC is not set 156# CONFIG_ARCH_RPC is not set
@@ -133,80 +158,48 @@ CONFIG_ARCH_PXA=y
133# CONFIG_ARCH_S3C2410 is not set 158# CONFIG_ARCH_S3C2410 is not set
134# CONFIG_ARCH_SHARK is not set 159# CONFIG_ARCH_SHARK is not set
135# CONFIG_ARCH_LH7A40X is not set 160# CONFIG_ARCH_LH7A40X is not set
161# CONFIG_ARCH_DAVINCI is not set
136# CONFIG_ARCH_OMAP is not set 162# CONFIG_ARCH_OMAP is not set
137# CONFIG_BOARD_IRQ_MAP_SMALL is not set 163# CONFIG_ARCH_MSM7X00A is not set
138CONFIG_BOARD_IRQ_MAP_BIG=y
139CONFIG_DMABOUNCE=y
140 164
141# 165#
142# Intel PXA2xx Implementations 166# Intel PXA2xx/PXA3xx Implementations
143# 167#
168# CONFIG_ARCH_GUMSTIX is not set
144# CONFIG_ARCH_LUBBOCK is not set 169# CONFIG_ARCH_LUBBOCK is not set
145# CONFIG_MACH_LOGICPD_PXA270 is not set 170# CONFIG_MACH_LOGICPD_PXA270 is not set
146# CONFIG_MACH_MAINSTONE is not set 171# CONFIG_MACH_MAINSTONE is not set
147# CONFIG_ARCH_PXA_IDP is not set 172# CONFIG_ARCH_PXA_IDP is not set
148CONFIG_TOSHIBA_TMIO_OHCI=y 173# CONFIG_PXA_SHARPSL is not set
149CONFIG_ARCH_ESERIES=y 174CONFIG_ARCH_PXA_ESERIES=y
150CONFIG_MACH_E330=y 175CONFIG_MACH_E330=y
176CONFIG_MACH_E350=y
151CONFIG_MACH_E740=y 177CONFIG_MACH_E740=y
152CONFIG_MACH_E750=y 178CONFIG_MACH_E750=y
153CONFIG_MACH_E400=y 179CONFIG_MACH_E400=y
154CONFIG_MACH_E800=y 180CONFIG_MACH_E800=y
155CONFIG_E330_LCD=y
156CONFIG_E740_LCD=y
157CONFIG_E750_LCD=y
158CONFIG_E400_LCD=y
159CONFIG_E800_LCD=y
160CONFIG_ESERIES_UDC=y
161CONFIG_E330_TC6387XB=y
162CONFIG_E740_T7L66XB=y
163CONFIG_E400_T7L66XB=y
164CONFIG_E750_E800_TC6393XB=y
165CONFIG_E740_PCMCIA=m
166CONFIG_E750_PCMCIA=m
167CONFIG_E800_PCMCIA=m
168# CONFIG_MACH_A620 is not set
169# CONFIG_MACH_A716 is not set
170# CONFIG_MACH_A730 is not set
171# CONFIG_ARCH_H1900 is not set
172# CONFIG_ARCH_H2200 is not set
173# CONFIG_MACH_H3900 is not set
174# CONFIG_MACH_H4000 is not set
175# CONFIG_MACH_H4700 is not set
176# CONFIG_MACH_HX2750 is not set
177# CONFIG_ARCH_H5400 is not set
178# CONFIG_MACH_HIMALAYA is not set
179# CONFIG_MACH_HTCUNIVERSAL is not set
180# CONFIG_MACH_HTCALPINE is not set
181# CONFIG_MACH_MAGICIAN is not set
182# CONFIG_MACH_HTCAPACHE is not set
183# CONFIG_MACH_BLUEANGEL is not set
184
185#
186# HTC_HW6X00
187#
188# CONFIG_MACH_HTCBEETLES is not set
189# CONFIG_MACH_HW6900 is not set
190# CONFIG_MACH_HTCATHENA is not set
191# CONFIG_ARCH_AXIMX3 is not set
192# CONFIG_ARCH_AXIMX5 is not set
193# CONFIG_MACH_X50 is not set
194# CONFIG_ARCH_ROVERP1 is not set
195# CONFIG_ARCH_ROVERP5P is not set
196# CONFIG_MACH_XSCALE_PALMLD is not set
197# CONFIG_MACH_T3XSCALE is not set
198# CONFIG_MACH_RECON is not set
199# CONFIG_MACH_GHI270HG is not set
200# CONFIG_MACH_GHI270 is not set
201# CONFIG_MACH_LOOXC550 is not set
202# CONFIG_PXA_SHARPSL is not set
203# CONFIG_MACH_TRIZEPS4 is not set 181# CONFIG_MACH_TRIZEPS4 is not set
182# CONFIG_MACH_EM_X270 is not set
183# CONFIG_MACH_COLIBRI is not set
184# CONFIG_MACH_ZYLONITE is not set
185# CONFIG_MACH_LITTLETON is not set
186# CONFIG_MACH_TAVOREVB is not set
187# CONFIG_MACH_SAAR is not set
188# CONFIG_MACH_ARMCORE is not set
189# CONFIG_MACH_MAGICIAN is not set
190# CONFIG_MACH_PCM027 is not set
191# CONFIG_ARCH_PXA_PALM is not set
192# CONFIG_PXA_EZX is not set
204CONFIG_PXA25x=y 193CONFIG_PXA25x=y
194# CONFIG_PXA_PWM is not set
195
196#
197# Boot options
198#
205 199
206# 200#
207# Linux As Bootloader 201# Power management
208# 202#
209# CONFIG_LAB is not set
210 203
211# 204#
212# Processor Type 205# Processor Type
@@ -215,6 +208,7 @@ CONFIG_CPU_32=y
215CONFIG_CPU_XSCALE=y 208CONFIG_CPU_XSCALE=y
216CONFIG_CPU_32v5=y 209CONFIG_CPU_32v5=y
217CONFIG_CPU_ABRT_EV5T=y 210CONFIG_CPU_ABRT_EV5T=y
211CONFIG_CPU_PABRT_NOIFAR=y
218CONFIG_CPU_CACHE_VIVT=y 212CONFIG_CPU_CACHE_VIVT=y
219CONFIG_CPU_TLB_V4WBI=y 213CONFIG_CPU_TLB_V4WBI=y
220CONFIG_CPU_CP15=y 214CONFIG_CPU_CP15=y
@@ -232,11 +226,9 @@ CONFIG_XSCALE_PMU=y
232# 226#
233# Bus support 227# Bus support
234# 228#
235 229# CONFIG_PCI_SYSCALL is not set
236# 230# CONFIG_ARCH_SUPPORTS_MSI is not set
237# PCCARD (PCMCIA/CardBus) support 231CONFIG_PCCARD=y
238#
239CONFIG_PCCARD=m
240# CONFIG_PCMCIA_DEBUG is not set 232# CONFIG_PCMCIA_DEBUG is not set
241CONFIG_PCMCIA=m 233CONFIG_PCMCIA=m
242CONFIG_PCMCIA_LOAD_CIS=y 234CONFIG_PCMCIA_LOAD_CIS=y
@@ -245,11 +237,14 @@ CONFIG_PCMCIA_IOCTL=y
245# 237#
246# PC-card bridges 238# PC-card bridges
247# 239#
248CONFIG_PCMCIA_PXA2XX=m
249 240
250# 241#
251# Kernel Features 242# Kernel Features
252# 243#
244CONFIG_TICK_ONESHOT=y
245# CONFIG_NO_HZ is not set
246# CONFIG_HIGH_RES_TIMERS is not set
247CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
253# CONFIG_PREEMPT is not set 248# CONFIG_PREEMPT is not set
254CONFIG_HZ=100 249CONFIG_HZ=100
255CONFIG_AEABI=y 250CONFIG_AEABI=y
@@ -262,9 +257,13 @@ CONFIG_FLATMEM_MANUAL=y
262CONFIG_FLATMEM=y 257CONFIG_FLATMEM=y
263CONFIG_FLAT_NODE_MEM_MAP=y 258CONFIG_FLAT_NODE_MEM_MAP=y
264# CONFIG_SPARSEMEM_STATIC is not set 259# CONFIG_SPARSEMEM_STATIC is not set
260# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
261CONFIG_PAGEFLAGS_EXTENDED=y
265CONFIG_SPLIT_PTLOCK_CPUS=4096 262CONFIG_SPLIT_PTLOCK_CPUS=4096
266# CONFIG_RESOURCES_64BIT is not set 263# CONFIG_RESOURCES_64BIT is not set
267CONFIG_ZONE_DMA_FLAG=1 264CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y
268CONFIG_ALIGNMENT_TRAP=y 267CONFIG_ALIGNMENT_TRAP=y
269 268
270# 269#
@@ -275,7 +274,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
275CONFIG_CMDLINE="" 274CONFIG_CMDLINE=""
276# CONFIG_XIP_KERNEL is not set 275# CONFIG_XIP_KERNEL is not set
277CONFIG_KEXEC=y 276CONFIG_KEXEC=y
278# CONFIG_TXTOFFSET_DELTA is not set 277CONFIG_ATAGS_PROC=y
279 278
280# 279#
281# CPU Frequency scaling 280# CPU Frequency scaling
@@ -304,11 +303,12 @@ CONFIG_BINFMT_MISC=y
304# Power management options 303# Power management options
305# 304#
306CONFIG_PM=y 305CONFIG_PM=y
307CONFIG_PM_LEGACY=y
308# CONFIG_PM_DEBUG is not set 306# CONFIG_PM_DEBUG is not set
309# CONFIG_DPM_DEBUG is not set 307CONFIG_PM_SLEEP=y
310# CONFIG_PM_SYSFS_DEPRECATED is not set 308CONFIG_SUSPEND=y
309CONFIG_SUSPEND_FREEZER=y
311# CONFIG_APM_EMULATION is not set 310# CONFIG_APM_EMULATION is not set
311CONFIG_ARCH_SUSPEND_POSSIBLE=y
312 312
313# 313#
314# Networking 314# Networking
@@ -318,13 +318,13 @@ CONFIG_NET=y
318# 318#
319# Networking options 319# Networking options
320# 320#
321# CONFIG_NETDEBUG is not set
322# CONFIG_PACKET is not set 321# CONFIG_PACKET is not set
323CONFIG_UNIX=y 322CONFIG_UNIX=y
324CONFIG_XFRM=y 323CONFIG_XFRM=y
325# CONFIG_XFRM_USER is not set 324# CONFIG_XFRM_USER is not set
326# CONFIG_XFRM_SUB_POLICY is not set 325# CONFIG_XFRM_SUB_POLICY is not set
327# CONFIG_XFRM_MIGRATE is not set 326# CONFIG_XFRM_MIGRATE is not set
327# CONFIG_XFRM_STATISTICS is not set
328# CONFIG_NET_KEY is not set 328# CONFIG_NET_KEY is not set
329CONFIG_INET=y 329CONFIG_INET=y
330# CONFIG_IP_MULTICAST is not set 330# CONFIG_IP_MULTICAST is not set
@@ -339,35 +339,40 @@ CONFIG_IP_FIB_HASH=y
339# CONFIG_INET_ESP is not set 339# CONFIG_INET_ESP is not set
340# CONFIG_INET_IPCOMP is not set 340# CONFIG_INET_IPCOMP is not set
341# CONFIG_INET_XFRM_TUNNEL is not set 341# CONFIG_INET_XFRM_TUNNEL is not set
342# CONFIG_INET_TUNNEL is not set 342CONFIG_INET_TUNNEL=y
343CONFIG_INET_XFRM_MODE_TRANSPORT=y 343CONFIG_INET_XFRM_MODE_TRANSPORT=y
344CONFIG_INET_XFRM_MODE_TUNNEL=y 344CONFIG_INET_XFRM_MODE_TUNNEL=y
345CONFIG_INET_XFRM_MODE_BEET=y 345CONFIG_INET_XFRM_MODE_BEET=y
346# CONFIG_INET_LRO is not set
346CONFIG_INET_DIAG=y 347CONFIG_INET_DIAG=y
347CONFIG_INET_TCP_DIAG=y 348CONFIG_INET_TCP_DIAG=y
348# CONFIG_TCP_CONG_ADVANCED is not set 349# CONFIG_TCP_CONG_ADVANCED is not set
349CONFIG_TCP_CONG_CUBIC=y 350CONFIG_TCP_CONG_CUBIC=y
350CONFIG_DEFAULT_TCP_CONG="cubic" 351CONFIG_DEFAULT_TCP_CONG="cubic"
351# CONFIG_TCP_MD5SIG is not set 352# CONFIG_TCP_MD5SIG is not set
352# CONFIG_IPV6 is not set 353CONFIG_IPV6=y
354# CONFIG_IPV6_PRIVACY is not set
355# CONFIG_IPV6_ROUTER_PREF is not set
356# CONFIG_IPV6_OPTIMISTIC_DAD is not set
357# CONFIG_INET6_AH is not set
358# CONFIG_INET6_ESP is not set
359# CONFIG_INET6_IPCOMP is not set
360# CONFIG_IPV6_MIP6 is not set
353# CONFIG_INET6_XFRM_TUNNEL is not set 361# CONFIG_INET6_XFRM_TUNNEL is not set
354# CONFIG_INET6_TUNNEL is not set 362# CONFIG_INET6_TUNNEL is not set
363CONFIG_INET6_XFRM_MODE_TRANSPORT=y
364CONFIG_INET6_XFRM_MODE_TUNNEL=y
365CONFIG_INET6_XFRM_MODE_BEET=y
366# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
367CONFIG_IPV6_SIT=y
368CONFIG_IPV6_NDISC_NODETYPE=y
369# CONFIG_IPV6_TUNNEL is not set
370# CONFIG_IPV6_MULTIPLE_TABLES is not set
371# CONFIG_IPV6_MROUTE is not set
355# CONFIG_NETWORK_SECMARK is not set 372# CONFIG_NETWORK_SECMARK is not set
356# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
357
358#
359# DCCP Configuration (EXPERIMENTAL)
360#
361# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
362
363#
364# SCTP Configuration (EXPERIMENTAL)
365#
366# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
367
368#
369# TIPC Configuration (EXPERIMENTAL)
370#
371# CONFIG_TIPC is not set 376# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 377# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 378# CONFIG_BRIDGE is not set
@@ -380,10 +385,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
380# CONFIG_LAPB is not set 385# CONFIG_LAPB is not set
381# CONFIG_ECONET is not set 386# CONFIG_ECONET is not set
382# CONFIG_WAN_ROUTER is not set 387# CONFIG_WAN_ROUTER is not set
383
384#
385# QoS and/or fair queueing
386#
387# CONFIG_NET_SCHED is not set 388# CONFIG_NET_SCHED is not set
388 389
389# 390#
@@ -391,15 +392,74 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
391# 392#
392# CONFIG_NET_PKTGEN is not set 393# CONFIG_NET_PKTGEN is not set
393# CONFIG_HAMRADIO is not set 394# CONFIG_HAMRADIO is not set
394# CONFIG_IRDA is not set 395# CONFIG_CAN is not set
396CONFIG_IRDA=y
397
398#
399# IrDA protocols
400#
401CONFIG_IRLAN=m
402CONFIG_IRCOMM=m
403CONFIG_IRDA_ULTRA=y
404
405#
406# IrDA options
407#
408CONFIG_IRDA_CACHE_LAST_LSAP=y
409CONFIG_IRDA_FAST_RR=y
410# CONFIG_IRDA_DEBUG is not set
411
412#
413# Infrared-port device drivers
414#
415
416#
417# SIR device drivers
418#
419# CONFIG_IRTTY_SIR is not set
420
421#
422# Dongle support
423#
424# CONFIG_KINGSUN_DONGLE is not set
425# CONFIG_KSDAZZLE_DONGLE is not set
426# CONFIG_KS959_DONGLE is not set
427
428#
429# FIR device drivers
430#
431# CONFIG_USB_IRDA is not set
432# CONFIG_SIGMATEL_FIR is not set
433CONFIG_PXA_FICP=y
434# CONFIG_MCS_FIR is not set
395# CONFIG_BT is not set 435# CONFIG_BT is not set
436# CONFIG_AF_RXRPC is not set
437
438#
439# Wireless
440#
441CONFIG_CFG80211=m
442CONFIG_NL80211=y
443CONFIG_WIRELESS_EXT=y
444CONFIG_WIRELESS_EXT_SYSFS=y
445CONFIG_MAC80211=m
446
447#
448# Rate control algorithm selection
449#
450CONFIG_MAC80211_RC_PID=y
451CONFIG_MAC80211_RC_DEFAULT_PID=y
452CONFIG_MAC80211_RC_DEFAULT="pid"
453# CONFIG_MAC80211_MESH is not set
454# CONFIG_MAC80211_LEDS is not set
455# CONFIG_MAC80211_DEBUG_MENU is not set
396CONFIG_IEEE80211=m 456CONFIG_IEEE80211=m
397# CONFIG_IEEE80211_DEBUG is not set 457# CONFIG_IEEE80211_DEBUG is not set
398CONFIG_IEEE80211_CRYPT_WEP=m 458CONFIG_IEEE80211_CRYPT_WEP=m
399# CONFIG_IEEE80211_CRYPT_CCMP is not set 459CONFIG_IEEE80211_CRYPT_CCMP=m
400# CONFIG_IEEE80211_CRYPT_TKIP is not set 460CONFIG_IEEE80211_CRYPT_TKIP=m
401# CONFIG_IEEE80211_SOFTMAC is not set 461# CONFIG_RFKILL is not set
402CONFIG_WIRELESS_EXT=y 462# CONFIG_NET_9P is not set
403 463
404# 464#
405# Device Drivers 465# Device Drivers
@@ -408,38 +468,32 @@ CONFIG_WIRELESS_EXT=y
408# 468#
409# Generic Driver Options 469# Generic Driver Options
410# 470#
471CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
411# CONFIG_STANDALONE is not set 472# CONFIG_STANDALONE is not set
412CONFIG_PREVENT_FIRMWARE_BUILD=y 473CONFIG_PREVENT_FIRMWARE_BUILD=y
413CONFIG_FW_LOADER=y 474CONFIG_FW_LOADER=y
475CONFIG_FIRMWARE_IN_KERNEL=y
476CONFIG_EXTRA_FIRMWARE=""
414# CONFIG_SYS_HYPERVISOR is not set 477# CONFIG_SYS_HYPERVISOR is not set
415
416#
417# Connector - unified userspace <-> kernelspace linker
418#
419# CONFIG_CONNECTOR is not set 478# CONFIG_CONNECTOR is not set
420
421#
422# Memory Technology Devices (MTD)
423#
424CONFIG_MTD=m 479CONFIG_MTD=m
425# CONFIG_MTD_DEBUG is not set 480# CONFIG_MTD_DEBUG is not set
426# CONFIG_MTD_CONCAT is not set 481# CONFIG_MTD_CONCAT is not set
427CONFIG_MTD_PARTITIONS=y 482# CONFIG_MTD_PARTITIONS is not set
428# CONFIG_MTD_REDBOOT_PARTS is not set
429# CONFIG_MTD_AFS_PARTS is not set
430 483
431# 484#
432# User Modules And Translation Layers 485# User Modules And Translation Layers
433# 486#
434CONFIG_MTD_CHAR=m 487# CONFIG_MTD_CHAR is not set
435CONFIG_MTD_BLKDEVS=m 488# CONFIG_MTD_BLKDEVS is not set
436CONFIG_MTD_BLOCK=m 489# CONFIG_MTD_BLOCK is not set
437# CONFIG_MTD_BLOCK_RO is not set 490# CONFIG_MTD_BLOCK_RO is not set
438# CONFIG_FTL is not set 491# CONFIG_FTL is not set
439# CONFIG_NFTL is not set 492# CONFIG_NFTL is not set
440# CONFIG_INFTL is not set 493# CONFIG_INFTL is not set
441# CONFIG_RFD_FTL is not set 494# CONFIG_RFD_FTL is not set
442# CONFIG_SSFDC is not set 495# CONFIG_SSFDC is not set
496# CONFIG_MTD_OOPS is not set
443 497
444# 498#
445# RAM/ROM/Flash chip drivers 499# RAM/ROM/Flash chip drivers
@@ -459,7 +513,6 @@ CONFIG_MTD_CFI_I2=y
459# CONFIG_MTD_RAM is not set 513# CONFIG_MTD_RAM is not set
460# CONFIG_MTD_ROM is not set 514# CONFIG_MTD_ROM is not set
461# CONFIG_MTD_ABSENT is not set 515# CONFIG_MTD_ABSENT is not set
462# CONFIG_MTD_OBSOLETE_CHIPS is not set
463 516
464# 517#
465# Mapping drivers for chip access 518# Mapping drivers for chip access
@@ -482,82 +535,43 @@ CONFIG_MTD_CFI_I2=y
482# CONFIG_MTD_DOC2000 is not set 535# CONFIG_MTD_DOC2000 is not set
483# CONFIG_MTD_DOC2001 is not set 536# CONFIG_MTD_DOC2001 is not set
484# CONFIG_MTD_DOC2001PLUS is not set 537# CONFIG_MTD_DOC2001PLUS is not set
485
486#
487# NAND Flash Device Drivers
488#
489CONFIG_MTD_NAND=m 538CONFIG_MTD_NAND=m
490CONFIG_MTD_NAND_VERIFY_WRITE=y 539# CONFIG_MTD_NAND_VERIFY_WRITE is not set
491# CONFIG_MTD_NAND_ECC_SMC is not set 540# CONFIG_MTD_NAND_ECC_SMC is not set
492# CONFIG_MTD_NAND_H1900 is not set 541# CONFIG_MTD_NAND_MUSEUM_IDS is not set
493CONFIG_MTD_NAND_IDS=m 542CONFIG_MTD_NAND_IDS=m
494# CONFIG_MTD_NAND_DISKONCHIP is not set 543# CONFIG_MTD_NAND_DISKONCHIP is not set
495# CONFIG_MTD_NAND_SHARPSL is not set 544# CONFIG_MTD_NAND_SHARPSL is not set
496# CONFIG_MTD_NAND_NANDSIM is not set 545# CONFIG_MTD_NAND_PLATFORM is not set
497 546# CONFIG_MTD_ALAUDA is not set
498#
499# OneNAND Flash Device Drivers
500#
501# CONFIG_MTD_ONENAND is not set 547# CONFIG_MTD_ONENAND is not set
502 548
503# 549#
504# Parallel port support 550# UBI - Unsorted block images
505# 551#
552# CONFIG_MTD_UBI is not set
506# CONFIG_PARPORT is not set 553# CONFIG_PARPORT is not set
507 554CONFIG_BLK_DEV=y
508#
509# Plug and Play support
510#
511# CONFIG_PNPACPI is not set
512
513#
514# Block devices
515#
516# CONFIG_BLK_DEV_COW_COMMON is not set 555# CONFIG_BLK_DEV_COW_COMMON is not set
517CONFIG_BLK_DEV_LOOP=m 556CONFIG_BLK_DEV_LOOP=m
518# CONFIG_BLK_DEV_CRYPTOLOOP is not set 557# CONFIG_BLK_DEV_CRYPTOLOOP is not set
519# CONFIG_BLK_DEV_NBD is not set 558# CONFIG_BLK_DEV_NBD is not set
520# CONFIG_BLK_DEV_UB is not set 559# CONFIG_BLK_DEV_UB is not set
521CONFIG_BLK_DEV_RAM=y 560# CONFIG_BLK_DEV_RAM is not set
522CONFIG_BLK_DEV_RAM_COUNT=16
523CONFIG_BLK_DEV_RAM_SIZE=6144
524CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
525# CONFIG_CDROM_PKTCDVD is not set 561# CONFIG_CDROM_PKTCDVD is not set
526# CONFIG_ATA_OVER_ETH is not set 562# CONFIG_ATA_OVER_ETH is not set
527 563CONFIG_MISC_DEVICES=y
528# 564# CONFIG_EEPROM_93CX6 is not set
529# ATA/ATAPI/MFM/RLL support 565# CONFIG_ENCLOSURE_SERVICES is not set
530# 566CONFIG_HAVE_IDE=y
531CONFIG_IDE=m 567# CONFIG_IDE is not set
532CONFIG_IDE_MAX_HWIFS=4
533CONFIG_BLK_DEV_IDE=m
534
535#
536# Please see Documentation/ide.txt for help/info on IDE drives
537#
538# CONFIG_BLK_DEV_IDE_SATA is not set
539CONFIG_BLK_DEV_IDEDISK=m
540# CONFIG_IDEDISK_MULTI_MODE is not set
541# CONFIG_BLK_DEV_IDECS is not set
542# CONFIG_BLK_DEV_IDECD is not set
543# CONFIG_BLK_DEV_IDETAPE is not set
544# CONFIG_BLK_DEV_IDEFLOPPY is not set
545# CONFIG_BLK_DEV_IDESCSI is not set
546# CONFIG_IDE_TASK_IOCTL is not set
547
548#
549# IDE chipset support/bugfixes
550#
551# CONFIG_IDE_GENERIC is not set
552# CONFIG_IDE_ARM is not set
553# CONFIG_BLK_DEV_IDEDMA is not set
554# CONFIG_BLK_DEV_HD is not set
555 568
556# 569#
557# SCSI device support 570# SCSI device support
558# 571#
559# CONFIG_RAID_ATTRS is not set 572# CONFIG_RAID_ATTRS is not set
560CONFIG_SCSI=m 573CONFIG_SCSI=m
574CONFIG_SCSI_DMA=y
561# CONFIG_SCSI_TGT is not set 575# CONFIG_SCSI_TGT is not set
562# CONFIG_SCSI_NETLINK is not set 576# CONFIG_SCSI_NETLINK is not set
563# CONFIG_SCSI_PROC_FS is not set 577# CONFIG_SCSI_PROC_FS is not set
@@ -565,7 +579,7 @@ CONFIG_SCSI=m
565# 579#
566# SCSI support type (disk, tape, CD-ROM) 580# SCSI support type (disk, tape, CD-ROM)
567# 581#
568# CONFIG_BLK_DEV_SD is not set 582CONFIG_BLK_DEV_SD=m
569# CONFIG_CHR_DEV_ST is not set 583# CONFIG_CHR_DEV_ST is not set
570# CONFIG_CHR_DEV_OSST is not set 584# CONFIG_CHR_DEV_OSST is not set
571# CONFIG_BLK_DEV_SR is not set 585# CONFIG_BLK_DEV_SR is not set
@@ -579,6 +593,7 @@ CONFIG_SCSI=m
579# CONFIG_SCSI_CONSTANTS is not set 593# CONFIG_SCSI_CONSTANTS is not set
580# CONFIG_SCSI_LOGGING is not set 594# CONFIG_SCSI_LOGGING is not set
581# CONFIG_SCSI_SCAN_ASYNC is not set 595# CONFIG_SCSI_SCAN_ASYNC is not set
596CONFIG_SCSI_WAIT_SCAN=m
582 597
583# 598#
584# SCSI Transports 599# SCSI Transports
@@ -586,132 +601,78 @@ CONFIG_SCSI=m
586# CONFIG_SCSI_SPI_ATTRS is not set 601# CONFIG_SCSI_SPI_ATTRS is not set
587# CONFIG_SCSI_FC_ATTRS is not set 602# CONFIG_SCSI_FC_ATTRS is not set
588# CONFIG_SCSI_ISCSI_ATTRS is not set 603# CONFIG_SCSI_ISCSI_ATTRS is not set
589# CONFIG_SCSI_SAS_ATTRS is not set
590# CONFIG_SCSI_SAS_LIBSAS is not set 604# CONFIG_SCSI_SAS_LIBSAS is not set
591 605# CONFIG_SCSI_SRP_ATTRS is not set
592# 606# CONFIG_SCSI_LOWLEVEL is not set
593# SCSI low-level drivers 607# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
594# 608# CONFIG_SCSI_DH is not set
595# CONFIG_ISCSI_TCP is not set 609CONFIG_ATA=m
596# CONFIG_SCSI_DEBUG is not set 610# CONFIG_ATA_NONSTANDARD is not set
597 611# CONFIG_SATA_PMP is not set
598# 612CONFIG_ATA_SFF=y
599# PCMCIA SCSI adapter support 613# CONFIG_SATA_MV is not set
600# 614CONFIG_PATA_PCMCIA=m
601# CONFIG_PCMCIA_AHA152X is not set 615# CONFIG_PATA_PLATFORM is not set
602# CONFIG_PCMCIA_FDOMAIN is not set
603# CONFIG_PCMCIA_NINJA_SCSI is not set
604# CONFIG_PCMCIA_QLOGIC is not set
605# CONFIG_PCMCIA_SYM53C500 is not set
606
607#
608# Serial ATA (prod) and Parallel ATA (experimental) drivers
609#
610# CONFIG_ATA is not set
611
612#
613# Multi-device support (RAID and LVM)
614#
615# CONFIG_MD is not set 616# CONFIG_MD is not set
616
617#
618# Fusion MPT device support
619#
620# CONFIG_FUSION is not set
621
622#
623# IEEE 1394 (FireWire) support
624#
625
626#
627# I2O device support
628#
629
630#
631# Network device support
632#
633CONFIG_NETDEVICES=y 617CONFIG_NETDEVICES=y
634# CONFIG_DUMMY is not set 618# CONFIG_DUMMY is not set
635# CONFIG_BONDING is not set 619# CONFIG_BONDING is not set
620# CONFIG_MACVLAN is not set
636# CONFIG_EQUALIZER is not set 621# CONFIG_EQUALIZER is not set
637# CONFIG_TUN is not set 622# CONFIG_TUN is not set
638 623# CONFIG_VETH is not set
639#
640# PHY device support
641#
642
643#
644# Ethernet (10 or 100Mbit)
645#
646# CONFIG_NET_ETHERNET is not set 624# CONFIG_NET_ETHERNET is not set
625# CONFIG_NETDEV_1000 is not set
626# CONFIG_NETDEV_10000 is not set
647 627
648# 628#
649# Ethernet (1000 Mbit) 629# Wireless LAN
650#
651
652#
653# Ethernet (10000 Mbit)
654#
655
656#
657# Token Ring devices
658#
659
660#
661# Wireless LAN (non-hamradio)
662#
663CONFIG_NET_RADIO=y
664# CONFIG_NET_WIRELESS_RTNETLINK is not set
665
666#
667# Obsolete Wireless cards support (pre-802.11)
668#
669# CONFIG_STRIP is not set
670# CONFIG_PCMCIA_WAVELAN is not set
671# CONFIG_PCMCIA_NETWAVE is not set
672
673#
674# Wireless 802.11 Frequency Hopping cards support
675# 630#
631# CONFIG_WLAN_PRE80211 is not set
632CONFIG_WLAN_80211=y
676# CONFIG_PCMCIA_RAYCS is not set 633# CONFIG_PCMCIA_RAYCS is not set
677 634# CONFIG_LIBERTAS is not set
678# 635CONFIG_HERMES=m
679# Wireless 802.11b ISA/PCI cards support 636CONFIG_PCMCIA_HERMES=m
680# 637# CONFIG_PCMCIA_SPECTRUM is not set
681# CONFIG_HERMES is not set
682# CONFIG_ATMEL is not set 638# CONFIG_ATMEL is not set
683
684#
685# Wireless 802.11b Pcmcia/Cardbus cards support
686#
687# CONFIG_AIRO_CS is not set 639# CONFIG_AIRO_CS is not set
688# CONFIG_PCMCIA_WL3501 is not set 640# CONFIG_PCMCIA_WL3501 is not set
689# CONFIG_USB_ZD1201 is not set 641# CONFIG_USB_ZD1201 is not set
690CONFIG_HOSTAP=m 642# CONFIG_USB_NET_RNDIS_WLAN is not set
691# CONFIG_HOSTAP_FIRMWARE is not set 643# CONFIG_RTL8187 is not set
692# CONFIG_HOSTAP_CS is not set 644# CONFIG_MAC80211_HWSIM is not set
693# CONFIG_ACX is not set 645# CONFIG_P54_COMMON is not set
694CONFIG_NET_WIRELESS=y 646# CONFIG_IWLWIFI_LEDS is not set
695 647# CONFIG_HOSTAP is not set
696# 648# CONFIG_B43 is not set
697# PCMCIA network device support 649# CONFIG_B43LEGACY is not set
698# 650# CONFIG_ZD1211RW is not set
699# CONFIG_NET_PCMCIA is not set 651# CONFIG_RT2X00 is not set
700 652
701# 653#
702# Wan interfaces 654# USB Network Adapters
703# 655#
656# CONFIG_USB_CATC is not set
657# CONFIG_USB_KAWETH is not set
658# CONFIG_USB_PEGASUS is not set
659# CONFIG_USB_RTL8150 is not set
660# CONFIG_USB_USBNET is not set
661CONFIG_NET_PCMCIA=y
662# CONFIG_PCMCIA_3C589 is not set
663# CONFIG_PCMCIA_3C574 is not set
664# CONFIG_PCMCIA_FMVJ18X is not set
665CONFIG_PCMCIA_PCNET=m
666# CONFIG_PCMCIA_NMCLAN is not set
667# CONFIG_PCMCIA_SMC91C92 is not set
668# CONFIG_PCMCIA_XIRC2PS is not set
669# CONFIG_PCMCIA_AXNET is not set
704# CONFIG_WAN is not set 670# CONFIG_WAN is not set
705# CONFIG_PPP is not set 671# CONFIG_PPP is not set
706# CONFIG_SLIP is not set 672# CONFIG_SLIP is not set
707# CONFIG_SHAPER is not set
708# CONFIG_NETCONSOLE is not set 673# CONFIG_NETCONSOLE is not set
709# CONFIG_NETPOLL is not set 674# CONFIG_NETPOLL is not set
710# CONFIG_NET_POLL_CONTROLLER is not set 675# CONFIG_NET_POLL_CONTROLLER is not set
711
712#
713# ISDN subsystem
714#
715# CONFIG_ISDN is not set 676# CONFIG_ISDN is not set
716 677
717# 678#
@@ -719,38 +680,48 @@ CONFIG_NET_WIRELESS=y
719# 680#
720CONFIG_INPUT=y 681CONFIG_INPUT=y
721# CONFIG_INPUT_FF_MEMLESS is not set 682# CONFIG_INPUT_FF_MEMLESS is not set
683# CONFIG_INPUT_POLLDEV is not set
722 684
723# 685#
724# Userland interfaces 686# Userland interfaces
725# 687#
726# CONFIG_INPUT_MOUSEDEV is not set 688# CONFIG_INPUT_MOUSEDEV is not set
727# CONFIG_INPUT_JOYDEV is not set 689# CONFIG_INPUT_JOYDEV is not set
728CONFIG_INPUT_TSDEV=m
729CONFIG_INPUT_TSDEV_SCREEN_X=240
730CONFIG_INPUT_TSDEV_SCREEN_Y=320
731CONFIG_INPUT_EVDEV=m 690CONFIG_INPUT_EVDEV=m
732# CONFIG_INPUT_EVBUG is not set 691# CONFIG_INPUT_EVBUG is not set
733# CONFIG_INPUT_LED_TRIGGER is not set
734 692
735# 693#
736# Input Device Drivers 694# Input Device Drivers
737# 695#
738# CONFIG_INPUT_KEYBOARD is not set 696CONFIG_INPUT_KEYBOARD=y
697# CONFIG_KEYBOARD_ATKBD is not set
698# CONFIG_KEYBOARD_SUNKBD is not set
699# CONFIG_KEYBOARD_LKKBD is not set
700# CONFIG_KEYBOARD_XTKBD is not set
701# CONFIG_KEYBOARD_NEWTON is not set
702# CONFIG_KEYBOARD_STOWAWAY is not set
703CONFIG_KEYBOARD_GPIO=m
739# CONFIG_INPUT_MOUSE is not set 704# CONFIG_INPUT_MOUSE is not set
740# CONFIG_INPUT_JOYSTICK is not set 705# CONFIG_INPUT_JOYSTICK is not set
706# CONFIG_INPUT_TABLET is not set
741CONFIG_INPUT_TOUCHSCREEN=y 707CONFIG_INPUT_TOUCHSCREEN=y
708# CONFIG_TOUCHSCREEN_FUJITSU is not set
742# CONFIG_TOUCHSCREEN_GUNZE is not set 709# CONFIG_TOUCHSCREEN_GUNZE is not set
743# CONFIG_TOUCHSCREEN_ELO is not set 710# CONFIG_TOUCHSCREEN_ELO is not set
744# CONFIG_TOUCHSCREEN_MTOUCH is not set 711# CONFIG_TOUCHSCREEN_MTOUCH is not set
712# CONFIG_TOUCHSCREEN_INEXIO is not set
745# CONFIG_TOUCHSCREEN_MK712 is not set 713# CONFIG_TOUCHSCREEN_MK712 is not set
746CONFIG_TOUCHSCREEN_WM97XX=m
747CONFIG_TOUCHSCREEN_WM9705=y
748CONFIG_TOUCHSCREEN_WM9712=y
749CONFIG_TOUCHSCREEN_WM9713=y
750# CONFIG_TOUCHSCREEN_PENMOUNT is not set 714# CONFIG_TOUCHSCREEN_PENMOUNT is not set
751# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set 715# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
752# CONFIG_TOUCHSCREEN_TOUCHWIN is not set 716# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
753# CONFIG_TOUCHSCREEN_UCB1400 is not set 717# CONFIG_TOUCHSCREEN_UCB1400 is not set
718CONFIG_TOUCHSCREEN_WM97XX=m
719CONFIG_TOUCHSCREEN_WM9705=y
720CONFIG_TOUCHSCREEN_WM9712=y
721CONFIG_TOUCHSCREEN_WM9713=y
722# CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set
723# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
724# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
754# CONFIG_INPUT_MISC is not set 725# CONFIG_INPUT_MISC is not set
755 726
756# 727#
@@ -763,9 +734,11 @@ CONFIG_TOUCHSCREEN_WM9713=y
763# Character devices 734# Character devices
764# 735#
765CONFIG_VT=y 736CONFIG_VT=y
737CONFIG_CONSOLE_TRANSLATIONS=y
766CONFIG_VT_CONSOLE=y 738CONFIG_VT_CONSOLE=y
767CONFIG_HW_CONSOLE=y 739CONFIG_HW_CONSOLE=y
768# CONFIG_VT_HW_CONSOLE_BINDING is not set 740# CONFIG_VT_HW_CONSOLE_BINDING is not set
741CONFIG_DEVKMEM=y
769# CONFIG_SERIAL_NONSTANDARD is not set 742# CONFIG_SERIAL_NONSTANDARD is not set
770 743
771# 744#
@@ -777,25 +750,12 @@ CONFIG_HW_CONSOLE=y
777# Non-8250 serial port support 750# Non-8250 serial port support
778# 751#
779# CONFIG_SERIAL_PXA is not set 752# CONFIG_SERIAL_PXA is not set
780# CONFIG_RS232_SERIAL is not set
781CONFIG_UNIX98_PTYS=y 753CONFIG_UNIX98_PTYS=y
782# CONFIG_LEGACY_PTYS is not set 754# CONFIG_LEGACY_PTYS is not set
783
784#
785# IPMI
786#
787# CONFIG_IPMI_HANDLER is not set 755# CONFIG_IPMI_HANDLER is not set
788
789#
790# Watchdog Cards
791#
792# CONFIG_WATCHDOG is not set
793CONFIG_HW_RANDOM=m 756CONFIG_HW_RANDOM=m
794# CONFIG_NVRAM is not set 757# CONFIG_NVRAM is not set
795# CONFIG_SA1100_RTC is not set
796# CONFIG_DTLK is not set
797# CONFIG_R3964 is not set 758# CONFIG_R3964 is not set
798# CONFIG_TIHTC is not set
799 759
800# 760#
801# PCMCIA character devices 761# PCMCIA character devices
@@ -803,117 +763,79 @@ CONFIG_HW_RANDOM=m
803# CONFIG_SYNCLINK_CS is not set 763# CONFIG_SYNCLINK_CS is not set
804# CONFIG_CARDMAN_4000 is not set 764# CONFIG_CARDMAN_4000 is not set
805# CONFIG_CARDMAN_4040 is not set 765# CONFIG_CARDMAN_4040 is not set
766# CONFIG_IPWIRELESS is not set
806# CONFIG_RAW_DRIVER is not set 767# CONFIG_RAW_DRIVER is not set
807
808#
809# TPM devices
810#
811# CONFIG_TCG_TPM is not set 768# CONFIG_TCG_TPM is not set
812
813#
814# I2C support
815#
816# CONFIG_I2C is not set 769# CONFIG_I2C is not set
817
818#
819# SPI support
820#
821# CONFIG_SPI is not set 770# CONFIG_SPI is not set
822# CONFIG_SPI_MASTER is not set 771CONFIG_ARCH_REQUIRE_GPIOLIB=y
823 772CONFIG_GPIOLIB=y
824# 773# CONFIG_GPIO_SYSFS is not set
825# Dallas's 1-wire bus
826#
827# CONFIG_W1 is not set
828 774
829# 775#
830# Hardware Monitoring support 776# I2C GPIO expanders:
831#
832# CONFIG_HWMON is not set
833# CONFIG_HWMON_VID is not set
834# CONFIG_POWER_SUPPLY is not set
835
836#
837# L3 serial bus support
838#
839# CONFIG_L3 is not set
840
841#
842# Misc devices
843# 777#
844 778
845# 779#
846# Multimedia Capabilities Port drivers 780# PCI GPIO expanders:
847# 781#
848# CONFIG_ADC is not set
849 782
850# 783#
851# Compaq/iPAQ Drivers 784# SPI GPIO expanders:
852# 785#
786# CONFIG_W1 is not set
787# CONFIG_POWER_SUPPLY is not set
788# CONFIG_HWMON is not set
789# CONFIG_WATCHDOG is not set
853 790
854# 791#
855# Compaq/HP iPAQ Drivers 792# Sonics Silicon Backplane
856# 793#
857# CONFIG_IPAQ_SLEEVE is not set 794CONFIG_SSB_POSSIBLE=y
858# CONFIG_SLEEVE_DEBUG is not set 795# CONFIG_SSB is not set
859 796
860# 797#
861# Multifunction device drivers 798# Multifunction device drivers
862# 799#
800CONFIG_MFD_CORE=y
863# CONFIG_MFD_SM501 is not set 801# CONFIG_MFD_SM501 is not set
864# CONFIG_HTC_ASIC2 is not set
865# CONFIG_HTC_ASIC3 is not set
866# CONFIG_HTC_PASIC3 is not set
867# CONFIG_HTC_EGPIO is not set 802# CONFIG_HTC_EGPIO is not set
868# CONFIG_HTC_BBKEYS is not set 803# CONFIG_HTC_PASIC3 is not set
869# CONFIG_HTC_ASIC3_DS1WM is not set 804CONFIG_MFD_TC6393XB=y
870# CONFIG_SOC_SAMCOP is not set
871# CONFIG_SOC_HAMCOP is not set
872# CONFIG_SOC_MQ11XX is not set
873CONFIG_SOC_T7L66XB=y
874# CONFIG_SOC_TC6387XB is not set
875CONFIG_SOC_TC6393XB=y
876# CONFIG_SOC_TSC2101 is not set
877# CONFIG_SOC_TSC2200 is not set
878
879#
880# LED devices
881#
882# CONFIG_NEW_LEDS is not set
883
884#
885# LED drivers
886#
887 805
888# 806#
889# LED Triggers 807# Multimedia devices
890# 808#
891# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
892 809
893# 810#
894# Multimedia devices 811# Multimedia core support
895# 812#
896# CONFIG_VIDEO_DEV is not set 813# CONFIG_VIDEO_DEV is not set
814# CONFIG_DVB_CORE is not set
815# CONFIG_VIDEO_MEDIA is not set
897 816
898# 817#
899# Digital Video Broadcasting Devices 818# Multimedia drivers
900# 819#
901# CONFIG_DVB is not set 820# CONFIG_DAB is not set
902# CONFIG_USB_DABUSB is not set
903 821
904# 822#
905# Graphics support 823# Graphics support
906# 824#
907CONFIG_BACKLIGHT_LCD_SUPPORT=y 825# CONFIG_VGASTATE is not set
908CONFIG_BACKLIGHT_CLASS_DEVICE=y 826# CONFIG_VIDEO_OUTPUT_CONTROL is not set
909CONFIG_LCD_CLASS_DEVICE=y
910CONFIG_BACKLIGHT_CORGI=y
911CONFIG_FB=y 827CONFIG_FB=y
912# CONFIG_FIRMWARE_EDID is not set 828# CONFIG_FIRMWARE_EDID is not set
913# CONFIG_FB_DDC is not set 829# CONFIG_FB_DDC is not set
914CONFIG_FB_CFB_FILLRECT=y 830CONFIG_FB_CFB_FILLRECT=y
915CONFIG_FB_CFB_COPYAREA=y 831CONFIG_FB_CFB_COPYAREA=y
916CONFIG_FB_CFB_IMAGEBLIT=y 832CONFIG_FB_CFB_IMAGEBLIT=y
833# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
834# CONFIG_FB_SYS_FILLRECT is not set
835# CONFIG_FB_SYS_COPYAREA is not set
836# CONFIG_FB_SYS_IMAGEBLIT is not set
837# CONFIG_FB_FOREIGN_ENDIAN is not set
838# CONFIG_FB_SYS_FOPS is not set
917# CONFIG_FB_SVGALIB is not set 839# CONFIG_FB_SVGALIB is not set
918# CONFIG_FB_MACMODES is not set 840# CONFIG_FB_MACMODES is not set
919# CONFIG_FB_BACKLIGHT is not set 841# CONFIG_FB_BACKLIGHT is not set
@@ -923,14 +845,25 @@ CONFIG_FB_CFB_IMAGEBLIT=y
923# 845#
924# Frame buffer hardware drivers 846# Frame buffer hardware drivers
925# 847#
926# CONFIG_FB_IMAGEON is not set
927# CONFIG_FB_S1D13XXX is not set 848# CONFIG_FB_S1D13XXX is not set
928CONFIG_FB_PXA=y 849CONFIG_FB_PXA=y
850# CONFIG_FB_PXA_SMARTPANEL is not set
929# CONFIG_FB_PXA_PARAMETERS is not set 851# CONFIG_FB_PXA_PARAMETERS is not set
930# CONFIG_FB_MBX is not set 852# CONFIG_FB_MBX is not set
931CONFIG_FB_W100=y 853CONFIG_FB_W100=y
854# CONFIG_FB_AM200EPD is not set
932# CONFIG_FB_VIRTUAL is not set 855# CONFIG_FB_VIRTUAL is not set
933# CONFIG_FB_VSFB is not set 856CONFIG_BACKLIGHT_LCD_SUPPORT=y
857CONFIG_LCD_CLASS_DEVICE=y
858# CONFIG_LCD_ILI9320 is not set
859# CONFIG_LCD_PLATFORM is not set
860CONFIG_BACKLIGHT_CLASS_DEVICE=y
861CONFIG_BACKLIGHT_CORGI=y
862
863#
864# Display device support
865#
866# CONFIG_DISPLAY_SUPPORT is not set
934 867
935# 868#
936# Console display driver support 869# Console display driver support
@@ -938,6 +871,7 @@ CONFIG_FB_W100=y
938# CONFIG_VGA_CONSOLE is not set 871# CONFIG_VGA_CONSOLE is not set
939CONFIG_DUMMY_CONSOLE=y 872CONFIG_DUMMY_CONSOLE=y
940CONFIG_FRAMEBUFFER_CONSOLE=y 873CONFIG_FRAMEBUFFER_CONSOLE=y
874# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
941# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 875# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
942CONFIG_FONTS=y 876CONFIG_FONTS=y
943# CONFIG_FONT_8x8 is not set 877# CONFIG_FONT_8x8 is not set
@@ -945,28 +879,13 @@ CONFIG_FONTS=y
945# CONFIG_FONT_6x11 is not set 879# CONFIG_FONT_6x11 is not set
946# CONFIG_FONT_7x14 is not set 880# CONFIG_FONT_7x14 is not set
947# CONFIG_FONT_PEARL_8x8 is not set 881# CONFIG_FONT_PEARL_8x8 is not set
948CONFIG_FONT_ACORN_8x8=y 882# CONFIG_FONT_ACORN_8x8 is not set
949# CONFIG_FONT_MINI_4x6 is not set 883CONFIG_FONT_MINI_4x6=y
950# CONFIG_FONT_SUN8x16 is not set 884# CONFIG_FONT_SUN8x16 is not set
951# CONFIG_FONT_SUN12x22 is not set 885# CONFIG_FONT_SUN12x22 is not set
952# CONFIG_FONT_10x18 is not set 886# CONFIG_FONT_10x18 is not set
953 887# CONFIG_LOGO is not set
954#
955# Logo configuration
956#
957CONFIG_LOGO=y
958# CONFIG_LOGO_LINUX_MONO is not set
959# CONFIG_LOGO_LINUX_VGA16 is not set
960CONFIG_LOGO_LINUX_CLUT224=y
961
962#
963# Sound
964#
965CONFIG_SOUND=y 888CONFIG_SOUND=y
966
967#
968# Advanced Linux Sound Architecture
969#
970CONFIG_SND=m 889CONFIG_SND=m
971CONFIG_SND_TIMER=m 890CONFIG_SND_TIMER=m
972CONFIG_SND_PCM=m 891CONFIG_SND_PCM=m
@@ -980,125 +899,75 @@ CONFIG_SND_SUPPORT_OLD_API=y
980CONFIG_SND_VERBOSE_PROCFS=y 899CONFIG_SND_VERBOSE_PROCFS=y
981CONFIG_SND_VERBOSE_PRINTK=y 900CONFIG_SND_VERBOSE_PRINTK=y
982# CONFIG_SND_DEBUG is not set 901# CONFIG_SND_DEBUG is not set
983 902CONFIG_SND_DRIVERS=y
984#
985# Generic devices
986#
987# CONFIG_SND_DUMMY is not set 903# CONFIG_SND_DUMMY is not set
988# CONFIG_SND_MTPAV is not set 904# CONFIG_SND_MTPAV is not set
989# CONFIG_SND_SERIAL_U16550 is not set 905# CONFIG_SND_SERIAL_U16550 is not set
990# CONFIG_SND_MPU401 is not set 906# CONFIG_SND_MPU401 is not set
991 907CONFIG_SND_ARM=y
992#
993# ALSA ARM devices
994#
995# CONFIG_SND_PXA2XX_AC97 is not set 908# CONFIG_SND_PXA2XX_AC97 is not set
996# CONFIG_SND_RECON is not set 909# CONFIG_SND_USB is not set
997 910# CONFIG_SND_PCMCIA is not set
998#
999# USB devices
1000#
1001# CONFIG_SND_USB_AUDIO is not set
1002
1003#
1004# PCMCIA devices
1005#
1006# CONFIG_SND_VXPOCKET is not set
1007# CONFIG_SND_PDAUDIOCF is not set
1008
1009#
1010# SoC audio support
1011#
1012CONFIG_SND_SOC_AC97_BUS=y
1013CONFIG_SND_SOC=m 911CONFIG_SND_SOC=m
1014 912CONFIG_SND_SOC_AC97_BUS=y
1015#
1016# SoC Platforms
1017#
1018
1019#
1020# SoC Audio for the Atmel AT91
1021#
1022
1023#
1024# SoC Audio for the Intel PXA2xx
1025#
1026CONFIG_SND_PXA2XX_SOC=m 913CONFIG_SND_PXA2XX_SOC=m
1027CONFIG_SND_PXA2XX_SOC_AC97=m 914CONFIG_SND_PXA2XX_SOC_AC97=m
1028CONFIG_SND_PXA2XX_SOC_E740_WM9705=m 915CONFIG_SND_PXA2XX_SOC_E800=m
1029CONFIG_SND_PXA2XX_SOC_E750_WM9705=m
1030CONFIG_SND_PXA2XX_SOC_E800_WM9712=m
1031# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set
1032# CONFIG_SND_PXA2XX_SOC_BLUEANGEL is not set
1033# CONFIG_SND_PXA2XX_SOC_H5000 is not set
1034
1035#
1036# SoC Audio for the Freescale i.MX
1037#
1038
1039#
1040# SoC Audio for the Samsung S3C24XX
1041#
1042# CONFIG_SND_SOC_AC97_CODEC is not set
1043# CONFIG_SND_SOC_WM8711 is not set
1044# CONFIG_SND_SOC_WM8510 is not set
1045# CONFIG_SND_SOC_WM8731 is not set
1046# CONFIG_SND_SOC_WM8750 is not set
1047# CONFIG_SND_SOC_WM8753 is not set
1048# CONFIG_SND_SOC_WM8772 is not set
1049# CONFIG_SND_SOC_WM8971 is not set
1050# CONFIG_SND_SOC_WM8956 is not set
1051# CONFIG_SND_SOC_WM8960 is not set
1052# CONFIG_SND_SOC_WM8976 is not set
1053# CONFIG_SND_SOC_WM8974 is not set
1054# CONFIG_SND_SOC_WM8980 is not set
1055CONFIG_SND_SOC_WM9705=m
1056# CONFIG_SND_SOC_WM9713 is not set
1057CONFIG_SND_SOC_WM9712=m 916CONFIG_SND_SOC_WM9712=m
1058# CONFIG_SND_SOC_UDA1380 is not set
1059# CONFIG_SND_SOC_AK4535 is not set
1060
1061#
1062# Open Sound System
1063#
1064# CONFIG_SOUND_PRIME is not set 917# CONFIG_SOUND_PRIME is not set
1065CONFIG_AC97_BUS=m 918CONFIG_AC97_BUS=m
919CONFIG_HID_SUPPORT=y
920CONFIG_HID=y
921# CONFIG_HID_DEBUG is not set
922# CONFIG_HIDRAW is not set
1066 923
1067# 924#
1068# HID Devices 925# USB Input Devices
1069# 926#
1070CONFIG_HID=y 927CONFIG_USB_HID=m
1071# CONFIG_HID_DEBUG is not set 928# CONFIG_USB_HIDINPUT_POWERBOOK is not set
929# CONFIG_HID_FF is not set
930# CONFIG_USB_HIDDEV is not set
1072 931
1073# 932#
1074# USB support 933# USB HID Boot Protocol drivers
1075# 934#
935# CONFIG_USB_KBD is not set
936# CONFIG_USB_MOUSE is not set
937CONFIG_USB_SUPPORT=y
1076CONFIG_USB_ARCH_HAS_HCD=y 938CONFIG_USB_ARCH_HAS_HCD=y
1077CONFIG_USB_ARCH_HAS_OHCI=y 939# CONFIG_USB_ARCH_HAS_OHCI is not set
1078# CONFIG_USB_ARCH_HAS_EHCI is not set 940# CONFIG_USB_ARCH_HAS_EHCI is not set
1079CONFIG_USB=m 941CONFIG_USB=m
1080CONFIG_USB_DEBUG=y 942# CONFIG_USB_DEBUG is not set
943# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1081 944
1082# 945#
1083# Miscellaneous USB options 946# Miscellaneous USB options
1084# 947#
1085CONFIG_USB_DEVICEFS=y 948# CONFIG_USB_DEVICEFS is not set
1086CONFIG_USB_DYNAMIC_MINORS=y 949CONFIG_USB_DEVICE_CLASS=y
950# CONFIG_USB_DYNAMIC_MINORS is not set
1087# CONFIG_USB_SUSPEND is not set 951# CONFIG_USB_SUSPEND is not set
1088# CONFIG_USB_OTG is not set 952# CONFIG_USB_OTG is not set
953# CONFIG_USB_OTG_WHITELIST is not set
954# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1089 955
1090# 956#
1091# USB Host Controller Drivers 957# USB Host Controller Drivers
1092# 958#
959# CONFIG_USB_C67X00_HCD is not set
1093# CONFIG_USB_ISP116X_HCD is not set 960# CONFIG_USB_ISP116X_HCD is not set
1094# CONFIG_USB_OHCI_HCD is not set 961# CONFIG_USB_ISP1760_HCD is not set
1095# CONFIG_USB_SL811_HCD is not set 962# CONFIG_USB_SL811_HCD is not set
963# CONFIG_USB_R8A66597_HCD is not set
1096 964
1097# 965#
1098# USB Device Class drivers 966# USB Device Class drivers
1099# 967#
1100# CONFIG_USB_ACM is not set 968# CONFIG_USB_ACM is not set
1101# CONFIG_USB_PRINTER is not set 969# CONFIG_USB_PRINTER is not set
970# CONFIG_USB_WDM is not set
1102 971
1103# 972#
1104# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1107,68 +976,19 @@ CONFIG_USB_DYNAMIC_MINORS=y
1107# 976#
1108# may also be needed; see USB_STORAGE Help for more information 977# may also be needed; see USB_STORAGE Help for more information
1109# 978#
1110CONFIG_USB_STORAGE=m 979# CONFIG_USB_STORAGE is not set
1111# CONFIG_USB_STORAGE_DEBUG is not set
1112# CONFIG_USB_STORAGE_DATAFAB is not set
1113# CONFIG_USB_STORAGE_FREECOM is not set
1114# CONFIG_USB_STORAGE_ISD200 is not set
1115# CONFIG_USB_STORAGE_DPCM is not set
1116# CONFIG_USB_STORAGE_USBAT is not set
1117# CONFIG_USB_STORAGE_SDDR09 is not set
1118# CONFIG_USB_STORAGE_SDDR55 is not set
1119# CONFIG_USB_STORAGE_JUMPSHOT is not set
1120# CONFIG_USB_STORAGE_ALAUDA is not set
1121# CONFIG_USB_STORAGE_KARMA is not set
1122# CONFIG_USB_LIBUSUAL is not set 980# CONFIG_USB_LIBUSUAL is not set
1123 981
1124# 982#
1125# USB Input Devices
1126#
1127# CONFIG_USB_HID is not set
1128
1129#
1130# USB HID Boot Protocol drivers
1131#
1132# CONFIG_USB_KBD is not set
1133# CONFIG_USB_MOUSE is not set
1134# CONFIG_USB_AIPTEK is not set
1135# CONFIG_USB_WACOM is not set
1136# CONFIG_USB_ACECAD is not set
1137# CONFIG_USB_KBTAB is not set
1138# CONFIG_USB_POWERMATE is not set
1139# CONFIG_USB_TOUCHSCREEN is not set
1140# CONFIG_USB_YEALINK is not set
1141# CONFIG_USB_XPAD is not set
1142# CONFIG_USB_ATI_REMOTE is not set
1143# CONFIG_USB_ATI_REMOTE2 is not set
1144# CONFIG_USB_KEYSPAN_REMOTE is not set
1145# CONFIG_USB_APPLETOUCH is not set
1146# CONFIG_USB_GTCO is not set
1147
1148#
1149# USB Imaging devices 983# USB Imaging devices
1150# 984#
1151# CONFIG_USB_MDC800 is not set 985# CONFIG_USB_MDC800 is not set
1152# CONFIG_USB_MICROTEK is not set 986# CONFIG_USB_MICROTEK is not set
1153 987CONFIG_USB_MON=y
1154#
1155# USB Network Adapters
1156#
1157# CONFIG_USB_CATC is not set
1158# CONFIG_USB_KAWETH is not set
1159# CONFIG_USB_PEGASUS is not set
1160# CONFIG_USB_RTL8150 is not set
1161# CONFIG_USB_USBNET_MII is not set
1162# CONFIG_USB_USBNET is not set
1163# CONFIG_USB_MON is not set
1164 988
1165# 989#
1166# USB port drivers 990# USB port drivers
1167# 991#
1168
1169#
1170# USB Serial Converter support
1171#
1172# CONFIG_USB_SERIAL is not set 992# CONFIG_USB_SERIAL is not set
1173 993
1174# 994#
@@ -1192,56 +1012,57 @@ CONFIG_USB_STORAGE=m
1192# CONFIG_USB_LD is not set 1012# CONFIG_USB_LD is not set
1193# CONFIG_USB_TRANCEVIBRATOR is not set 1013# CONFIG_USB_TRANCEVIBRATOR is not set
1194# CONFIG_USB_IOWARRIOR is not set 1014# CONFIG_USB_IOWARRIOR is not set
1195# CONFIG_USB_TEST is not set 1015# CONFIG_USB_ISIGHTFW is not set
1196
1197#
1198# USB DSL modem support
1199#
1200
1201#
1202# USB Gadget Support
1203#
1204CONFIG_USB_GADGET=y 1016CONFIG_USB_GADGET=y
1205# CONFIG_USB_GADGET_DEBUG_FILES is not set 1017# CONFIG_USB_GADGET_DEBUG_FILES is not set
1206CONFIG_USB_GADGET_SELECTED=y 1018CONFIG_USB_GADGET_SELECTED=y
1019# CONFIG_USB_GADGET_AMD5536UDC is not set
1020# CONFIG_USB_GADGET_ATMEL_USBA is not set
1021# CONFIG_USB_GADGET_FSL_USB2 is not set
1207# CONFIG_USB_GADGET_NET2280 is not set 1022# CONFIG_USB_GADGET_NET2280 is not set
1208CONFIG_USB_GADGET_PXA2XX=y 1023CONFIG_USB_GADGET_PXA25X=y
1209CONFIG_USB_PXA2XX=y 1024CONFIG_USB_PXA25X=y
1210# CONFIG_USB_PXA2XX_SMALL is not set 1025CONFIG_USB_PXA25X_SMALL=y
1026# CONFIG_USB_GADGET_M66592 is not set
1211# CONFIG_USB_GADGET_PXA27X is not set 1027# CONFIG_USB_GADGET_PXA27X is not set
1212# CONFIG_USB_GADGET_GOKU is not set 1028# CONFIG_USB_GADGET_GOKU is not set
1213# CONFIG_USB_GADGET_MQ11XX is not set
1214# CONFIG_USB_GADGET_LH7A40X is not set 1029# CONFIG_USB_GADGET_LH7A40X is not set
1215# CONFIG_USB_GADGET_S3C2410 is not set
1216# CONFIG_USB_GADGET_OMAP is not set 1030# CONFIG_USB_GADGET_OMAP is not set
1031# CONFIG_USB_GADGET_S3C2410 is not set
1217# CONFIG_USB_GADGET_AT91 is not set 1032# CONFIG_USB_GADGET_AT91 is not set
1218# CONFIG_USB_GADGET_DUMMY_HCD is not set 1033# CONFIG_USB_GADGET_DUMMY_HCD is not set
1219# CONFIG_USB_GADGET_DUALSPEED is not set 1034# CONFIG_USB_GADGET_DUALSPEED is not set
1220# CONFIG_USB_ZERO is not set 1035# CONFIG_USB_ZERO is not set
1221CONFIG_USB_ETH=y 1036CONFIG_USB_ETH=m
1222# CONFIG_USB_ETH_RNDIS is not set 1037# CONFIG_USB_ETH_RNDIS is not set
1223# CONFIG_USB_GADGETFS is not set 1038# CONFIG_USB_GADGETFS is not set
1224# CONFIG_USB_FILE_STORAGE is not set 1039# CONFIG_USB_FILE_STORAGE is not set
1225# CONFIG_USB_G_SERIAL is not set 1040# CONFIG_USB_G_SERIAL is not set
1226# CONFIG_USB_MIDI_GADGET is not set 1041# CONFIG_USB_MIDI_GADGET is not set
1227# CONFIG_USB_G_CHAR is not set 1042# CONFIG_USB_G_PRINTER is not set
1228# CONFIG_USB_PXA2XX_GPIO is not set 1043# CONFIG_USB_CDC_COMPOSITE is not set
1044CONFIG_MMC=y
1045# CONFIG_MMC_DEBUG is not set
1046CONFIG_MMC_UNSAFE_RESUME=y
1229 1047
1230# 1048#
1231# MMC/SD Card support 1049# MMC/SD Card Drivers
1232# 1050#
1233CONFIG_MMC=y
1234# CONFIG_MMC_DEBUG is not set
1235CONFIG_MMC_BLOCK=y 1051CONFIG_MMC_BLOCK=y
1236# CONFIG_MMC_PXA is not set 1052CONFIG_MMC_BLOCK_BOUNCE=y
1237CONFIG_MMC_TMIO=y 1053# CONFIG_SDIO_UART is not set
1238# CONFIG_MMC_SAMCOP is not set 1054# CONFIG_MMC_TEST is not set
1239 1055
1240# 1056#
1241# Real Time Clock 1057# MMC/SD Host Controller Drivers
1242# 1058#
1059# CONFIG_MMC_PXA is not set
1060# CONFIG_MMC_SDHCI is not set
1061# CONFIG_NEW_LEDS is not set
1243CONFIG_RTC_LIB=y 1062CONFIG_RTC_LIB=y
1244# CONFIG_RTC_CLASS is not set 1063# CONFIG_RTC_CLASS is not set
1064# CONFIG_DMADEVICES is not set
1065# CONFIG_UIO is not set
1245 1066
1246# 1067#
1247# File systems 1068# File systems
@@ -1255,14 +1076,11 @@ CONFIG_EXT2_FS=y
1255# CONFIG_JFS_FS is not set 1076# CONFIG_JFS_FS is not set
1256# CONFIG_FS_POSIX_ACL is not set 1077# CONFIG_FS_POSIX_ACL is not set
1257# CONFIG_XFS_FS is not set 1078# CONFIG_XFS_FS is not set
1258# CONFIG_GFS2_FS is not set
1259# CONFIG_OCFS2_FS is not set 1079# CONFIG_OCFS2_FS is not set
1260# CONFIG_MINIX_FS is not set 1080CONFIG_DNOTIFY=y
1261# CONFIG_ROMFS_FS is not set
1262CONFIG_INOTIFY=y 1081CONFIG_INOTIFY=y
1263CONFIG_INOTIFY_USER=y 1082CONFIG_INOTIFY_USER=y
1264# CONFIG_QUOTA is not set 1083# CONFIG_QUOTA is not set
1265CONFIG_DNOTIFY=y
1266# CONFIG_AUTOFS_FS is not set 1084# CONFIG_AUTOFS_FS is not set
1267# CONFIG_AUTOFS4_FS is not set 1085# CONFIG_AUTOFS4_FS is not set
1268# CONFIG_FUSE_FS is not set 1086# CONFIG_FUSE_FS is not set
@@ -1292,7 +1110,6 @@ CONFIG_SYSFS=y
1292CONFIG_TMPFS=y 1110CONFIG_TMPFS=y
1293# CONFIG_TMPFS_POSIX_ACL is not set 1111# CONFIG_TMPFS_POSIX_ACL is not set
1294# CONFIG_HUGETLB_PAGE is not set 1112# CONFIG_HUGETLB_PAGE is not set
1295CONFIG_RAMFS=y
1296# CONFIG_CONFIGFS_FS is not set 1113# CONFIG_CONFIGFS_FS is not set
1297 1114
1298# 1115#
@@ -1305,30 +1122,21 @@ CONFIG_RAMFS=y
1305# CONFIG_BEFS_FS is not set 1122# CONFIG_BEFS_FS is not set
1306# CONFIG_BFS_FS is not set 1123# CONFIG_BFS_FS is not set
1307# CONFIG_EFS_FS is not set 1124# CONFIG_EFS_FS is not set
1308CONFIG_JFFS2_FS=m 1125# CONFIG_JFFS2_FS is not set
1309CONFIG_JFFS2_FS_DEBUG=0
1310CONFIG_JFFS2_FS_WRITEBUFFER=y
1311# CONFIG_JFFS2_SUMMARY is not set
1312# CONFIG_JFFS2_FS_XATTR is not set
1313# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1314CONFIG_JFFS2_ZLIB=y
1315CONFIG_JFFS2_RTIME=y
1316# CONFIG_JFFS2_RUBIN is not set
1317# CONFIG_CRAMFS is not set 1126# CONFIG_CRAMFS is not set
1318# CONFIG_VXFS_FS is not set 1127# CONFIG_VXFS_FS is not set
1128# CONFIG_MINIX_FS is not set
1129# CONFIG_OMFS_FS is not set
1319# CONFIG_HPFS_FS is not set 1130# CONFIG_HPFS_FS is not set
1320# CONFIG_QNX4FS_FS is not set 1131# CONFIG_QNX4FS_FS is not set
1132# CONFIG_ROMFS_FS is not set
1321# CONFIG_SYSV_FS is not set 1133# CONFIG_SYSV_FS is not set
1322# CONFIG_UFS_FS is not set 1134# CONFIG_UFS_FS is not set
1323 1135CONFIG_NETWORK_FILESYSTEMS=y
1324#
1325# Network File Systems
1326#
1327CONFIG_NFS_FS=y 1136CONFIG_NFS_FS=y
1328CONFIG_NFS_V3=y 1137CONFIG_NFS_V3=y
1329# CONFIG_NFS_V3_ACL is not set 1138# CONFIG_NFS_V3_ACL is not set
1330# CONFIG_NFS_V4 is not set 1139# CONFIG_NFS_V4 is not set
1331# CONFIG_NFS_DIRECTIO is not set
1332# CONFIG_NFSD is not set 1140# CONFIG_NFSD is not set
1333CONFIG_LOCKD=y 1141CONFIG_LOCKD=y
1334CONFIG_LOCKD_V4=y 1142CONFIG_LOCKD_V4=y
@@ -1341,7 +1149,6 @@ CONFIG_SUNRPC=y
1341# CONFIG_NCP_FS is not set 1149# CONFIG_NCP_FS is not set
1342# CONFIG_CODA_FS is not set 1150# CONFIG_CODA_FS is not set
1343# CONFIG_AFS_FS is not set 1151# CONFIG_AFS_FS is not set
1344# CONFIG_9P_FS is not set
1345 1152
1346# 1153#
1347# Partition Types 1154# Partition Types
@@ -1363,10 +1170,7 @@ CONFIG_MSDOS_PARTITION=y
1363# CONFIG_SUN_PARTITION is not set 1170# CONFIG_SUN_PARTITION is not set
1364# CONFIG_KARMA_PARTITION is not set 1171# CONFIG_KARMA_PARTITION is not set
1365# CONFIG_EFI_PARTITION is not set 1172# CONFIG_EFI_PARTITION is not set
1366 1173# CONFIG_SYSV68_PARTITION is not set
1367#
1368# Native Language Support
1369#
1370CONFIG_NLS=y 1174CONFIG_NLS=y
1371CONFIG_NLS_DEFAULT="iso8859-1" 1175CONFIG_NLS_DEFAULT="iso8859-1"
1372CONFIG_NLS_CODEPAGE_437=y 1176CONFIG_NLS_CODEPAGE_437=y
@@ -1407,30 +1211,32 @@ CONFIG_NLS_ISO8859_1=y
1407# CONFIG_NLS_KOI8_R is not set 1211# CONFIG_NLS_KOI8_R is not set
1408# CONFIG_NLS_KOI8_U is not set 1212# CONFIG_NLS_KOI8_U is not set
1409# CONFIG_NLS_UTF8 is not set 1213# CONFIG_NLS_UTF8 is not set
1410
1411#
1412# Distributed Lock Manager
1413#
1414# CONFIG_DLM is not set 1214# CONFIG_DLM is not set
1415 1215
1416# 1216#
1417# Profiling support
1418#
1419# CONFIG_PROFILING is not set
1420
1421#
1422# Kernel hacking 1217# Kernel hacking
1423# 1218#
1424# CONFIG_PRINTK_TIME is not set 1219# CONFIG_PRINTK_TIME is not set
1425CONFIG_ENABLE_MUST_CHECK=y 1220# CONFIG_ENABLE_WARN_DEPRECATED is not set
1221# CONFIG_ENABLE_MUST_CHECK is not set
1222CONFIG_FRAME_WARN=1024
1426# CONFIG_MAGIC_SYSRQ is not set 1223# CONFIG_MAGIC_SYSRQ is not set
1427# CONFIG_UNUSED_SYMBOLS is not set 1224# CONFIG_UNUSED_SYMBOLS is not set
1428# CONFIG_DEBUG_FS is not set 1225# CONFIG_DEBUG_FS is not set
1429# CONFIG_HEADERS_CHECK is not set 1226# CONFIG_HEADERS_CHECK is not set
1430# CONFIG_DEBUG_KERNEL is not set 1227# CONFIG_DEBUG_KERNEL is not set
1431CONFIG_LOG_BUF_SHIFT=14
1432# CONFIG_DEBUG_BUGVERBOSE is not set 1228# CONFIG_DEBUG_BUGVERBOSE is not set
1229# CONFIG_DEBUG_MEMORY_INIT is not set
1433CONFIG_FRAME_POINTER=y 1230CONFIG_FRAME_POINTER=y
1231# CONFIG_LATENCYTOP is not set
1232CONFIG_HAVE_FTRACE=y
1233CONFIG_HAVE_DYNAMIC_FTRACE=y
1234# CONFIG_FTRACE is not set
1235# CONFIG_IRQSOFF_TRACER is not set
1236# CONFIG_SCHED_TRACER is not set
1237# CONFIG_CONTEXT_SWITCH_TRACER is not set
1238# CONFIG_SAMPLES is not set
1239CONFIG_HAVE_ARCH_KGDB=y
1434# CONFIG_DEBUG_USER is not set 1240# CONFIG_DEBUG_USER is not set
1435 1241
1436# 1242#
@@ -1438,61 +1244,102 @@ CONFIG_FRAME_POINTER=y
1438# 1244#
1439# CONFIG_KEYS is not set 1245# CONFIG_KEYS is not set
1440# CONFIG_SECURITY is not set 1246# CONFIG_SECURITY is not set
1247# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1248CONFIG_CRYPTO=y
1441 1249
1442# 1250#
1443# Cryptographic options 1251# Crypto core or helper
1444# 1252#
1445CONFIG_CRYPTO=y
1446CONFIG_CRYPTO_ALGAPI=m 1253CONFIG_CRYPTO_ALGAPI=m
1447CONFIG_CRYPTO_BLKCIPHER=m 1254CONFIG_CRYPTO_BLKCIPHER=m
1448CONFIG_CRYPTO_MANAGER=m 1255CONFIG_CRYPTO_MANAGER=m
1256# CONFIG_CRYPTO_GF128MUL is not set
1257# CONFIG_CRYPTO_NULL is not set
1258# CONFIG_CRYPTO_CRYPTD is not set
1259# CONFIG_CRYPTO_AUTHENC is not set
1260# CONFIG_CRYPTO_TEST is not set
1261
1262#
1263# Authenticated Encryption with Associated Data
1264#
1265# CONFIG_CRYPTO_CCM is not set
1266# CONFIG_CRYPTO_GCM is not set
1267# CONFIG_CRYPTO_SEQIV is not set
1268
1269#
1270# Block modes
1271#
1272CONFIG_CRYPTO_CBC=m
1273# CONFIG_CRYPTO_CTR is not set
1274# CONFIG_CRYPTO_CTS is not set
1275CONFIG_CRYPTO_ECB=m
1276# CONFIG_CRYPTO_LRW is not set
1277CONFIG_CRYPTO_PCBC=m
1278# CONFIG_CRYPTO_XTS is not set
1279
1280#
1281# Hash modes
1282#
1449# CONFIG_CRYPTO_HMAC is not set 1283# CONFIG_CRYPTO_HMAC is not set
1450# CONFIG_CRYPTO_XCBC is not set 1284# CONFIG_CRYPTO_XCBC is not set
1451# CONFIG_CRYPTO_NULL is not set 1285
1286#
1287# Digest
1288#
1289# CONFIG_CRYPTO_CRC32C is not set
1452# CONFIG_CRYPTO_MD4 is not set 1290# CONFIG_CRYPTO_MD4 is not set
1453# CONFIG_CRYPTO_MD5 is not set 1291# CONFIG_CRYPTO_MD5 is not set
1292CONFIG_CRYPTO_MICHAEL_MIC=m
1293# CONFIG_CRYPTO_RMD128 is not set
1294# CONFIG_CRYPTO_RMD160 is not set
1295# CONFIG_CRYPTO_RMD256 is not set
1296# CONFIG_CRYPTO_RMD320 is not set
1454# CONFIG_CRYPTO_SHA1 is not set 1297# CONFIG_CRYPTO_SHA1 is not set
1455# CONFIG_CRYPTO_SHA256 is not set 1298# CONFIG_CRYPTO_SHA256 is not set
1456# CONFIG_CRYPTO_SHA512 is not set 1299# CONFIG_CRYPTO_SHA512 is not set
1457# CONFIG_CRYPTO_WP512 is not set
1458# CONFIG_CRYPTO_TGR192 is not set 1300# CONFIG_CRYPTO_TGR192 is not set
1459# CONFIG_CRYPTO_GF128MUL is not set 1301# CONFIG_CRYPTO_WP512 is not set
1460CONFIG_CRYPTO_ECB=m 1302
1461CONFIG_CRYPTO_CBC=m 1303#
1462CONFIG_CRYPTO_PCBC=m 1304# Ciphers
1463# CONFIG_CRYPTO_LRW is not set 1305#
1464# CONFIG_CRYPTO_DES is not set 1306CONFIG_CRYPTO_AES=m
1465# CONFIG_CRYPTO_FCRYPT is not set 1307# CONFIG_CRYPTO_ANUBIS is not set
1308CONFIG_CRYPTO_ARC4=m
1466# CONFIG_CRYPTO_BLOWFISH is not set 1309# CONFIG_CRYPTO_BLOWFISH is not set
1467# CONFIG_CRYPTO_TWOFISH is not set 1310# CONFIG_CRYPTO_CAMELLIA is not set
1468# CONFIG_CRYPTO_SERPENT is not set
1469# CONFIG_CRYPTO_AES is not set
1470# CONFIG_CRYPTO_CAST5 is not set 1311# CONFIG_CRYPTO_CAST5 is not set
1471# CONFIG_CRYPTO_CAST6 is not set 1312# CONFIG_CRYPTO_CAST6 is not set
1472# CONFIG_CRYPTO_TEA is not set 1313# CONFIG_CRYPTO_DES is not set
1473CONFIG_CRYPTO_ARC4=m 1314# CONFIG_CRYPTO_FCRYPT is not set
1474# CONFIG_CRYPTO_KHAZAD is not set 1315# CONFIG_CRYPTO_KHAZAD is not set
1475# CONFIG_CRYPTO_ANUBIS is not set 1316# CONFIG_CRYPTO_SALSA20 is not set
1476# CONFIG_CRYPTO_DEFLATE is not set 1317# CONFIG_CRYPTO_SEED is not set
1477# CONFIG_CRYPTO_MICHAEL_MIC is not set 1318# CONFIG_CRYPTO_SERPENT is not set
1478# CONFIG_CRYPTO_CRC32C is not set 1319# CONFIG_CRYPTO_TEA is not set
1479# CONFIG_CRYPTO_CAMELLIA is not set 1320# CONFIG_CRYPTO_TWOFISH is not set
1480# CONFIG_CRYPTO_TEST is not set
1481 1321
1482# 1322#
1483# Hardware crypto devices 1323# Compression
1484# 1324#
1325# CONFIG_CRYPTO_DEFLATE is not set
1326# CONFIG_CRYPTO_LZO is not set
1327CONFIG_CRYPTO_HW=y
1485 1328
1486# 1329#
1487# Library routines 1330# Library routines
1488# 1331#
1489CONFIG_BITREVERSE=y 1332CONFIG_BITREVERSE=y
1490# CONFIG_CRC_CCITT is not set 1333# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1334# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1335CONFIG_CRC_CCITT=y
1491# CONFIG_CRC16 is not set 1336# CONFIG_CRC16 is not set
1337# CONFIG_CRC_T10DIF is not set
1338# CONFIG_CRC_ITU_T is not set
1492CONFIG_CRC32=y 1339CONFIG_CRC32=y
1340# CONFIG_CRC7 is not set
1493# CONFIG_LIBCRC32C is not set 1341# CONFIG_LIBCRC32C is not set
1494CONFIG_ZLIB_INFLATE=m
1495CONFIG_ZLIB_DEFLATE=m
1496CONFIG_PLIST=y 1342CONFIG_PLIST=y
1497CONFIG_HAS_IOMEM=y 1343CONFIG_HAS_IOMEM=y
1498CONFIG_HAS_IOPORT=y 1344CONFIG_HAS_IOPORT=y
1345CONFIG_HAS_DMA=y
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index a1c41d7c0be9..117cf6c9afce 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -330,10 +330,10 @@ static void __init cap9adk_board_init(void)
330 /* Serial */ 330 /* Serial */
331 at91_add_device_serial(); 331 at91_add_device_serial();
332 /* USB Host */ 332 /* USB Host */
333 set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH); 333 set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH);
334 at91_add_device_usbh(&cap9adk_usbh_data); 334 at91_add_device_usbh(&cap9adk_usbh_data);
335 /* USB HS */ 335 /* USB HS */
336 set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH); 336 set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH);
337 at91_add_device_usba(&cap9adk_usba_udc_data); 337 at91_add_device_usba(&cap9adk_usba_udc_data);
338 /* SPI */ 338 /* SPI */
339 at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices)); 339 at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices));
@@ -350,7 +350,7 @@ static void __init cap9adk_board_init(void)
350 /* I2C */ 350 /* I2C */
351 at91_add_device_i2c(NULL, 0); 351 at91_add_device_i2c(NULL, 0);
352 /* LCD Controller */ 352 /* LCD Controller */
353 set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH); 353 set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH);
354 at91_add_device_lcdc(&cap9adk_lcdc_data); 354 at91_add_device_lcdc(&cap9adk_lcdc_data);
355 /* AC97 */ 355 /* AC97 */
356 at91_add_device_ac97(&cap9adk_ac97_data); 356 at91_add_device_ac97(&cap9adk_ac97_data);
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index bbbfd06f5e0c..bbbfd06f5e0c 100755..100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c
index 78a5cdb746dc..ca87587b2b4b 100644
--- a/arch/arm/mach-at91/irq.c
+++ b/arch/arm/mach-at91/irq.c
@@ -56,19 +56,19 @@ static int at91_aic_set_type(unsigned irq, unsigned type)
56 unsigned int smr, srctype; 56 unsigned int smr, srctype;
57 57
58 switch (type) { 58 switch (type) {
59 case IRQT_HIGH: 59 case IRQ_TYPE_LEVEL_HIGH:
60 srctype = AT91_AIC_SRCTYPE_HIGH; 60 srctype = AT91_AIC_SRCTYPE_HIGH;
61 break; 61 break;
62 case IRQT_RISING: 62 case IRQ_TYPE_EDGE_RISING:
63 srctype = AT91_AIC_SRCTYPE_RISING; 63 srctype = AT91_AIC_SRCTYPE_RISING;
64 break; 64 break;
65 case IRQT_LOW: 65 case IRQ_TYPE_LEVEL_LOW:
66 if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ 66 if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */
67 srctype = AT91_AIC_SRCTYPE_LOW; 67 srctype = AT91_AIC_SRCTYPE_LOW;
68 else 68 else
69 return -EINVAL; 69 return -EINVAL;
70 break; 70 break;
71 case IRQT_FALLING: 71 case IRQ_TYPE_EDGE_FALLING:
72 if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ 72 if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */
73 srctype = AT91_AIC_SRCTYPE_FALLING; 73 srctype = AT91_AIC_SRCTYPE_FALLING;
74 else 74 else
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 1d7bca6aa441..5fed57608507 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -226,7 +226,7 @@ static void ep93xx_gpio_irq_ack(unsigned int irq)
226 int port = line >> 3; 226 int port = line >> 3;
227 int port_mask = 1 << (line & 7); 227 int port_mask = 1 << (line & 7);
228 228
229 if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { 229 if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
230 gpio_int_type2[port] ^= port_mask; /* switch edge direction */ 230 gpio_int_type2[port] ^= port_mask; /* switch edge direction */
231 ep93xx_gpio_update_int_params(port); 231 ep93xx_gpio_update_int_params(port);
232 } 232 }
@@ -240,7 +240,7 @@ static void ep93xx_gpio_irq_mask_ack(unsigned int irq)
240 int port = line >> 3; 240 int port = line >> 3;
241 int port_mask = 1 << (line & 7); 241 int port_mask = 1 << (line & 7);
242 242
243 if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) 243 if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)
244 gpio_int_type2[port] ^= port_mask; /* switch edge direction */ 244 gpio_int_type2[port] ^= port_mask; /* switch edge direction */
245 245
246 gpio_int_unmasked[port] &= ~port_mask; 246 gpio_int_unmasked[port] &= ~port_mask;
@@ -283,27 +283,27 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type)
283 gpio_direction_input(gpio); 283 gpio_direction_input(gpio);
284 284
285 switch (type) { 285 switch (type) {
286 case IRQT_RISING: 286 case IRQ_TYPE_EDGE_RISING:
287 gpio_int_type1[port] |= port_mask; 287 gpio_int_type1[port] |= port_mask;
288 gpio_int_type2[port] |= port_mask; 288 gpio_int_type2[port] |= port_mask;
289 desc->handle_irq = handle_edge_irq; 289 desc->handle_irq = handle_edge_irq;
290 break; 290 break;
291 case IRQT_FALLING: 291 case IRQ_TYPE_EDGE_FALLING:
292 gpio_int_type1[port] |= port_mask; 292 gpio_int_type1[port] |= port_mask;
293 gpio_int_type2[port] &= ~port_mask; 293 gpio_int_type2[port] &= ~port_mask;
294 desc->handle_irq = handle_edge_irq; 294 desc->handle_irq = handle_edge_irq;
295 break; 295 break;
296 case IRQT_HIGH: 296 case IRQ_TYPE_LEVEL_HIGH:
297 gpio_int_type1[port] &= ~port_mask; 297 gpio_int_type1[port] &= ~port_mask;
298 gpio_int_type2[port] |= port_mask; 298 gpio_int_type2[port] |= port_mask;
299 desc->handle_irq = handle_level_irq; 299 desc->handle_irq = handle_level_irq;
300 break; 300 break;
301 case IRQT_LOW: 301 case IRQ_TYPE_LEVEL_LOW:
302 gpio_int_type1[port] &= ~port_mask; 302 gpio_int_type1[port] &= ~port_mask;
303 gpio_int_type2[port] &= ~port_mask; 303 gpio_int_type2[port] &= ~port_mask;
304 desc->handle_irq = handle_level_irq; 304 desc->handle_irq = handle_level_irq;
305 break; 305 break;
306 case IRQT_BOTHEDGE: 306 case IRQ_TYPE_EDGE_BOTH:
307 gpio_int_type1[port] |= port_mask; 307 gpio_int_type1[port] |= port_mask;
308 /* set initial polarity based on current input level */ 308 /* set initial polarity based on current input level */
309 if (gpio_get_value(gpio)) 309 if (gpio_get_value(gpio))
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index e6695c4e623b..e1b1f028b930 100644
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -111,7 +111,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
111 reg = irq >> 5; 111 reg = irq >> 5;
112 bit = 1 << (irq % 32); 112 bit = 1 << (irq % 32);
113 113
114 if (type == IRQT_PROBE) { 114 if (type == IRQ_TYPE_PROBE) {
115 /* Don't mess with enabled GPIOs using preconfigured edges or 115 /* Don't mess with enabled GPIOs using preconfigured edges or
116 GPIOs set to alternate function during probe */ 116 GPIOs set to alternate function during probe */
117 /* TODO: support probe */ 117 /* TODO: support probe */
@@ -120,7 +120,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
120// return 0; 120// return 0;
121// if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2))) 121// if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2)))
122// return 0; 122// return 0;
123// type = __IRQT_RISEDGE | __IRQT_FALEDGE; 123// type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
124 } 124 }
125 125
126 GIUS(reg) |= bit; 126 GIUS(reg) |= bit;
@@ -128,19 +128,19 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
128 128
129 DEBUG_IRQ("setting type of irq %d to ", _irq); 129 DEBUG_IRQ("setting type of irq %d to ", _irq);
130 130
131 if (type & __IRQT_RISEDGE) { 131 if (type & IRQ_TYPE_EDGE_RISING) {
132 DEBUG_IRQ("rising edges\n"); 132 DEBUG_IRQ("rising edges\n");
133 irq_type = 0x0; 133 irq_type = 0x0;
134 } 134 }
135 if (type & __IRQT_FALEDGE) { 135 if (type & IRQ_TYPE_EDGE_FALLING) {
136 DEBUG_IRQ("falling edges\n"); 136 DEBUG_IRQ("falling edges\n");
137 irq_type = 0x1; 137 irq_type = 0x1;
138 } 138 }
139 if (type & __IRQT_LOWLVL) { 139 if (type & IRQ_TYPE_LEVEL_LOW) {
140 DEBUG_IRQ("low level\n"); 140 DEBUG_IRQ("low level\n");
141 irq_type = 0x3; 141 irq_type = 0x3;
142 } 142 }
143 if (type & __IRQT_HIGHLVL) { 143 if (type & IRQ_TYPE_LEVEL_HIGH) {
144 DEBUG_IRQ("high level\n"); 144 DEBUG_IRQ("high level\n");
145 irq_type = 0x2; 145 irq_type = 0x2;
146 } 146 }
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 81cdc8267206..daf28074134b 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -329,19 +329,19 @@ static int ixp2000_GPIO_irq_type(unsigned int irq, unsigned int type)
329 /* 329 /*
330 * Then, set the proper trigger type. 330 * Then, set the proper trigger type.
331 */ 331 */
332 if (type & IRQT_FALLING) 332 if (type & IRQ_TYPE_EDGE_FALLING)
333 GPIO_IRQ_falling_edge |= 1 << line; 333 GPIO_IRQ_falling_edge |= 1 << line;
334 else 334 else
335 GPIO_IRQ_falling_edge &= ~(1 << line); 335 GPIO_IRQ_falling_edge &= ~(1 << line);
336 if (type & IRQT_RISING) 336 if (type & IRQ_TYPE_EDGE_RISING)
337 GPIO_IRQ_rising_edge |= 1 << line; 337 GPIO_IRQ_rising_edge |= 1 << line;
338 else 338 else
339 GPIO_IRQ_rising_edge &= ~(1 << line); 339 GPIO_IRQ_rising_edge &= ~(1 << line);
340 if (type & IRQT_LOW) 340 if (type & IRQ_TYPE_LEVEL_LOW)
341 GPIO_IRQ_level_low |= 1 << line; 341 GPIO_IRQ_level_low |= 1 << line;
342 else 342 else
343 GPIO_IRQ_level_low &= ~(1 << line); 343 GPIO_IRQ_level_low &= ~(1 << line);
344 if (type & IRQT_HIGH) 344 if (type & IRQ_TYPE_LEVEL_HIGH)
345 GPIO_IRQ_level_high |= 1 << line; 345 GPIO_IRQ_level_high |= 1 << line;
346 else 346 else
347 GPIO_IRQ_level_high &= ~(1 << line); 347 GPIO_IRQ_level_high &= ~(1 << line);
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index 5fea5a132939..df16a4eac490 100644
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -126,23 +126,23 @@ static int ixp23xx_irq_set_type(unsigned int irq, unsigned int type)
126 return -EINVAL; 126 return -EINVAL;
127 127
128 switch (type) { 128 switch (type) {
129 case IRQT_BOTHEDGE: 129 case IRQ_TYPE_EDGE_BOTH:
130 int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL; 130 int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL;
131 irq_type = IXP23XX_IRQ_EDGE; 131 irq_type = IXP23XX_IRQ_EDGE;
132 break; 132 break;
133 case IRQT_RISING: 133 case IRQ_TYPE_EDGE_RISING:
134 int_style = IXP23XX_GPIO_STYLE_RISING_EDGE; 134 int_style = IXP23XX_GPIO_STYLE_RISING_EDGE;
135 irq_type = IXP23XX_IRQ_EDGE; 135 irq_type = IXP23XX_IRQ_EDGE;
136 break; 136 break;
137 case IRQT_FALLING: 137 case IRQ_TYPE_EDGE_FALLING:
138 int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE; 138 int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE;
139 irq_type = IXP23XX_IRQ_EDGE; 139 irq_type = IXP23XX_IRQ_EDGE;
140 break; 140 break;
141 case IRQT_HIGH: 141 case IRQ_TYPE_LEVEL_HIGH:
142 int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH; 142 int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH;
143 irq_type = IXP23XX_IRQ_LEVEL; 143 irq_type = IXP23XX_IRQ_LEVEL;
144 break; 144 break;
145 case IRQT_LOW: 145 case IRQ_TYPE_LEVEL_LOW:
146 int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW; 146 int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW;
147 irq_type = IXP23XX_IRQ_LEVEL; 147 irq_type = IXP23XX_IRQ_LEVEL;
148 break; 148 break;
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c
index f0f70ba1e46d..896ff9f840d9 100644
--- a/arch/arm/mach-ixp23xx/roadrunner.c
+++ b/arch/arm/mach-ixp23xx/roadrunner.c
@@ -110,8 +110,8 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
110 110
111static void __init roadrunner_pci_preinit(void) 111static void __init roadrunner_pci_preinit(void)
112{ 112{
113 set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW); 113 set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
114 set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW); 114 set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
115 115
116 ixp23xx_pci_preinit(); 116 ixp23xx_pci_preinit();
117} 117}
diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
index 3f867691d9f2..c6e044befccb 100644
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -30,10 +30,10 @@
30 30
31void __init avila_pci_preinit(void) 31void __init avila_pci_preinit(void)
32{ 32{
33 set_irq_type(IRQ_AVILA_PCI_INTA, IRQT_LOW); 33 set_irq_type(IRQ_AVILA_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
34 set_irq_type(IRQ_AVILA_PCI_INTB, IRQT_LOW); 34 set_irq_type(IRQ_AVILA_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
35 set_irq_type(IRQ_AVILA_PCI_INTC, IRQT_LOW); 35 set_irq_type(IRQ_AVILA_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
36 set_irq_type(IRQ_AVILA_PCI_INTD, IRQT_LOW); 36 set_irq_type(IRQ_AVILA_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
37 37
38 ixp4xx_pci_preinit(); 38 ixp4xx_pci_preinit();
39} 39}
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 3781b3db9f49..3947c506b4f3 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -142,23 +142,23 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
142 return -EINVAL; 142 return -EINVAL;
143 143
144 switch (type){ 144 switch (type){
145 case IRQT_BOTHEDGE: 145 case IRQ_TYPE_EDGE_BOTH:
146 int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL; 146 int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL;
147 irq_type = IXP4XX_IRQ_EDGE; 147 irq_type = IXP4XX_IRQ_EDGE;
148 break; 148 break;
149 case IRQT_RISING: 149 case IRQ_TYPE_EDGE_RISING:
150 int_style = IXP4XX_GPIO_STYLE_RISING_EDGE; 150 int_style = IXP4XX_GPIO_STYLE_RISING_EDGE;
151 irq_type = IXP4XX_IRQ_EDGE; 151 irq_type = IXP4XX_IRQ_EDGE;
152 break; 152 break;
153 case IRQT_FALLING: 153 case IRQ_TYPE_EDGE_FALLING:
154 int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE; 154 int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE;
155 irq_type = IXP4XX_IRQ_EDGE; 155 irq_type = IXP4XX_IRQ_EDGE;
156 break; 156 break;
157 case IRQT_HIGH: 157 case IRQ_TYPE_LEVEL_HIGH:
158 int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH; 158 int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;
159 irq_type = IXP4XX_IRQ_LEVEL; 159 irq_type = IXP4XX_IRQ_LEVEL;
160 break; 160 break;
161 case IRQT_LOW: 161 case IRQ_TYPE_LEVEL_LOW:
162 int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW; 162 int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
163 irq_type = IXP4XX_IRQ_LEVEL; 163 irq_type = IXP4XX_IRQ_LEVEL;
164 break; 164 break;
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index ad2e5b97966e..be4f4a208b90 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -27,8 +27,8 @@
27 27
28void __init coyote_pci_preinit(void) 28void __init coyote_pci_preinit(void)
29{ 29{
30 set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQT_LOW); 30 set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQ_TYPE_LEVEL_LOW);
31 set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQT_LOW); 31 set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQ_TYPE_LEVEL_LOW);
32 32
33 ixp4xx_pci_preinit(); 33 ixp4xx_pci_preinit();
34} 34}
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c
index 9db7e1f42011..926d15f885fb 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-pci.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-pci.c
@@ -25,12 +25,12 @@
25 25
26void __init dsmg600_pci_preinit(void) 26void __init dsmg600_pci_preinit(void)
27{ 27{
28 set_irq_type(IRQ_DSMG600_PCI_INTA, IRQT_LOW); 28 set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
29 set_irq_type(IRQ_DSMG600_PCI_INTB, IRQT_LOW); 29 set_irq_type(IRQ_DSMG600_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
30 set_irq_type(IRQ_DSMG600_PCI_INTC, IRQT_LOW); 30 set_irq_type(IRQ_DSMG600_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
31 set_irq_type(IRQ_DSMG600_PCI_INTD, IRQT_LOW); 31 set_irq_type(IRQ_DSMG600_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
32 set_irq_type(IRQ_DSMG600_PCI_INTE, IRQT_LOW); 32 set_irq_type(IRQ_DSMG600_PCI_INTE, IRQ_TYPE_LEVEL_LOW);
33 set_irq_type(IRQ_DSMG600_PCI_INTF, IRQT_LOW); 33 set_irq_type(IRQ_DSMG600_PCI_INTF, IRQ_TYPE_LEVEL_LOW);
34 34
35 ixp4xx_pci_preinit(); 35 ixp4xx_pci_preinit();
36} 36}
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
index f19f3f6feda1..ca12a9ca0830 100644
--- a/arch/arm/mach-ixp4xx/fsg-pci.c
+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -25,9 +25,9 @@
25 25
26void __init fsg_pci_preinit(void) 26void __init fsg_pci_preinit(void)
27{ 27{
28 set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW); 28 set_irq_type(IRQ_FSG_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
29 set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW); 29 set_irq_type(IRQ_FSG_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
30 set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW); 30 set_irq_type(IRQ_FSG_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
31 31
32 ixp4xx_pci_preinit(); 32 ixp4xx_pci_preinit();
33} 33}
diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c
index 6abf568322d3..afd1dc14e597 100644
--- a/arch/arm/mach-ixp4xx/gateway7001-pci.c
+++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -29,8 +29,8 @@
29 29
30void __init gateway7001_pci_preinit(void) 30void __init gateway7001_pci_preinit(void)
31{ 31{
32 set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW); 32 set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
33 set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW); 33 set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
34 34
35 ixp4xx_pci_preinit(); 35 ixp4xx_pci_preinit();
36} 36}
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index 49dec7868807..20960704183b 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -41,10 +41,10 @@
41 */ 41 */
42void __init gtwx5715_pci_preinit(void) 42void __init gtwx5715_pci_preinit(void)
43{ 43{
44 set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQT_LOW); 44 set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQ_TYPE_LEVEL_LOW);
45 set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQT_LOW); 45 set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQ_TYPE_LEVEL_LOW);
46 set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQT_LOW); 46 set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQ_TYPE_LEVEL_LOW);
47 set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQT_LOW); 47 set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQ_TYPE_LEVEL_LOW);
48 48
49 ixp4xx_pci_preinit(); 49 ixp4xx_pci_preinit();
50} 50}
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index 408796004812..7d9bb4d23104 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -27,10 +27,10 @@
27 27
28void __init ixdp425_pci_preinit(void) 28void __init ixdp425_pci_preinit(void)
29{ 29{
30 set_irq_type(IRQ_IXDP425_PCI_INTA, IRQT_LOW); 30 set_irq_type(IRQ_IXDP425_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
31 set_irq_type(IRQ_IXDP425_PCI_INTB, IRQT_LOW); 31 set_irq_type(IRQ_IXDP425_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
32 set_irq_type(IRQ_IXDP425_PCI_INTC, IRQT_LOW); 32 set_irq_type(IRQ_IXDP425_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
33 set_irq_type(IRQ_IXDP425_PCI_INTD, IRQT_LOW); 33 set_irq_type(IRQ_IXDP425_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
34 34
35 ixp4xx_pci_preinit(); 35 ixp4xx_pci_preinit();
36} 36}
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index d1e75b7dc3b1..37d9f2e8f602 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -25,8 +25,8 @@
25 25
26void __init ixdpg425_pci_preinit(void) 26void __init ixdpg425_pci_preinit(void)
27{ 27{
28 set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW); 28 set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
29 set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW); 29 set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW);
30 30
31 ixp4xx_pci_preinit(); 31 ixp4xx_pci_preinit();
32} 32}
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index b8ebaf4a9c8e..1088426fdcee 100644
--- a/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -24,11 +24,11 @@
24 24
25void __init nas100d_pci_preinit(void) 25void __init nas100d_pci_preinit(void)
26{ 26{
27 set_irq_type(IRQ_NAS100D_PCI_INTA, IRQT_LOW); 27 set_irq_type(IRQ_NAS100D_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
28 set_irq_type(IRQ_NAS100D_PCI_INTB, IRQT_LOW); 28 set_irq_type(IRQ_NAS100D_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
29 set_irq_type(IRQ_NAS100D_PCI_INTC, IRQT_LOW); 29 set_irq_type(IRQ_NAS100D_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
30 set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW); 30 set_irq_type(IRQ_NAS100D_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
31 set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW); 31 set_irq_type(IRQ_NAS100D_PCI_INTE, IRQ_TYPE_LEVEL_LOW);
32 32
33 ixp4xx_pci_preinit(); 33 ixp4xx_pci_preinit();
34} 34}
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
index 04661fef97f5..4429b8448b61 100644
--- a/arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -24,9 +24,9 @@
24 24
25void __init nslu2_pci_preinit(void) 25void __init nslu2_pci_preinit(void)
26{ 26{
27 set_irq_type(IRQ_NSLU2_PCI_INTA, IRQT_LOW); 27 set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
28 set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW); 28 set_irq_type(IRQ_NSLU2_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
29 set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW); 29 set_irq_type(IRQ_NSLU2_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
30 30
31 ixp4xx_pci_preinit(); 31 ixp4xx_pci_preinit();
32} 32}
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c
index 6588f2c758e2..0f00feab67f8 100644
--- a/arch/arm/mach-ixp4xx/wg302v2-pci.c
+++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -29,8 +29,8 @@
29 29
30void __init wg302v2_pci_preinit(void) 30void __init wg302v2_pci_preinit(void)
31{ 31{
32 set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW); 32 set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
33 set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW); 33 set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW);
34 34
35 ixp4xx_pci_preinit(); 35 ixp4xx_pci_preinit();
36} 36}
diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c
index 4c3ab43e1046..0b06941a1eed 100644
--- a/arch/arm/mach-ks8695/irq.c
+++ b/arch/arm/mach-ks8695/irq.c
@@ -72,21 +72,21 @@ static int ks8695_irq_set_type(unsigned int irqno, unsigned int type)
72 ctrl = __raw_readl(KS8695_GPIO_VA + KS8695_IOPC); 72 ctrl = __raw_readl(KS8695_GPIO_VA + KS8695_IOPC);
73 73
74 switch (type) { 74 switch (type) {
75 case IRQT_HIGH: 75 case IRQ_TYPE_LEVEL_HIGH:
76 mode = IOPC_TM_HIGH; 76 mode = IOPC_TM_HIGH;
77 level_triggered = 1; 77 level_triggered = 1;
78 break; 78 break;
79 case IRQT_LOW: 79 case IRQ_TYPE_LEVEL_LOW:
80 mode = IOPC_TM_LOW; 80 mode = IOPC_TM_LOW;
81 level_triggered = 1; 81 level_triggered = 1;
82 break; 82 break;
83 case IRQT_RISING: 83 case IRQ_TYPE_EDGE_RISING:
84 mode = IOPC_TM_RISING; 84 mode = IOPC_TM_RISING;
85 break; 85 break;
86 case IRQT_FALLING: 86 case IRQ_TYPE_EDGE_FALLING:
87 mode = IOPC_TM_FALLING; 87 mode = IOPC_TM_FALLING;
88 break; 88 break;
89 case IRQT_BOTHEDGE: 89 case IRQ_TYPE_EDGE_BOTH:
90 mode = IOPC_TM_EDGE; 90 mode = IOPC_TM_EDGE;
91 break; 91 break;
92 default: 92 default:
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index fd7537f7d11e..99d4fb19a08a 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -99,19 +99,19 @@ netx_hif_irq_type(unsigned int _irq, unsigned int type)
99 99
100 irq = _irq - NETX_IRQ_HIF_CHAINED(0); 100 irq = _irq - NETX_IRQ_HIF_CHAINED(0);
101 101
102 if (type & __IRQT_RISEDGE) { 102 if (type & IRQ_TYPE_EDGE_RISING) {
103 DEBUG_IRQ("rising edges\n"); 103 DEBUG_IRQ("rising edges\n");
104 val |= (1 << 26) << irq; 104 val |= (1 << 26) << irq;
105 } 105 }
106 if (type & __IRQT_FALEDGE) { 106 if (type & IRQ_TYPE_EDGE_FALLING) {
107 DEBUG_IRQ("falling edges\n"); 107 DEBUG_IRQ("falling edges\n");
108 val &= ~((1 << 26) << irq); 108 val &= ~((1 << 26) << irq);
109 } 109 }
110 if (type & __IRQT_LOWLVL) { 110 if (type & IRQ_TYPE_LEVEL_LOW) {
111 DEBUG_IRQ("low level\n"); 111 DEBUG_IRQ("low level\n");
112 val &= ~((1 << 26) << irq); 112 val &= ~((1 << 26) << irq);
113 } 113 }
114 if (type & __IRQT_HIGHLVL) { 114 if (type & IRQ_TYPE_LEVEL_HIGH) {
115 DEBUG_IRQ("high level\n"); 115 DEBUG_IRQ("high level\n");
116 val |= (1 << 26) << irq; 116 val |= (1 << 26) << irq;
117 } 117 }
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 845c66371ca3..41f94f6fc15c 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -288,7 +288,7 @@ static void __init osk_init_cf(void)
288 return; 288 return;
289 } 289 }
290 /* the CF I/O IRQ is really active-low */ 290 /* the CF I/O IRQ is really active-low */
291 set_irq_type(OMAP_GPIO_IRQ(62), IRQT_FALLING); 291 set_irq_type(OMAP_GPIO_IRQ(62), IRQ_TYPE_EDGE_FALLING);
292} 292}
293 293
294static void __init osk_init_irq(void) 294static void __init osk_init_irq(void)
@@ -483,7 +483,7 @@ static void __init osk_mistral_init(void)
483 omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */ 483 omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */
484 gpio_request(4, "ts_int"); 484 gpio_request(4, "ts_int");
485 gpio_direction_input(4); 485 gpio_direction_input(4);
486 set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); 486 set_irq_type(OMAP_GPIO_IRQ(4), IRQ_TYPE_EDGE_FALLING);
487 487
488 spi_register_board_info(mistral_boardinfo, 488 spi_register_board_info(mistral_boardinfo,
489 ARRAY_SIZE(mistral_boardinfo)); 489 ARRAY_SIZE(mistral_boardinfo));
@@ -494,7 +494,7 @@ static void __init osk_mistral_init(void)
494 int ret = 0; 494 int ret = 0;
495 495
496 gpio_direction_input(OMAP_MPUIO(2)); 496 gpio_direction_input(OMAP_MPUIO(2));
497 set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQT_RISING); 497 set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQ_TYPE_EDGE_RISING);
498#ifdef CONFIG_PM 498#ifdef CONFIG_PM
499 /* share the IRQ in case someone wants to use the 499 /* share the IRQ in case someone wants to use the
500 * button for more than wakeup from system sleep. 500 * button for more than wakeup from system sleep.
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index e020c2774606..34389b63b0ec 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -298,11 +298,11 @@ palmz71_powercable(int irq, void *dev_id)
298 if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) { 298 if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) {
299 printk(KERN_INFO "PM: Power cable connected\n"); 299 printk(KERN_INFO "PM: Power cable connected\n");
300 set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), 300 set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
301 IRQT_FALLING); 301 IRQ_TYPE_EDGE_FALLING);
302 } else { 302 } else {
303 printk(KERN_INFO "PM: Power cable disconnected\n"); 303 printk(KERN_INFO "PM: Power cable disconnected\n");
304 set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), 304 set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
305 IRQT_RISING); 305 IRQ_TYPE_EDGE_RISING);
306 } 306 }
307 return IRQ_HANDLED; 307 return IRQ_HANDLED;
308} 308}
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 5c00b3f39cdd..8948d45a2769 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -186,10 +186,10 @@ static void __init voiceblue_init(void)
186 omap_request_gpio(13); 186 omap_request_gpio(13);
187 omap_request_gpio(14); 187 omap_request_gpio(14);
188 omap_request_gpio(15); 188 omap_request_gpio(15);
189 set_irq_type(OMAP_GPIO_IRQ(12), IRQT_RISING); 189 set_irq_type(OMAP_GPIO_IRQ(12), IRQ_TYPE_EDGE_RISING);
190 set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); 190 set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
191 set_irq_type(OMAP_GPIO_IRQ(14), IRQT_RISING); 191 set_irq_type(OMAP_GPIO_IRQ(14), IRQ_TYPE_EDGE_RISING);
192 set_irq_type(OMAP_GPIO_IRQ(15), IRQT_RISING); 192 set_irq_type(OMAP_GPIO_IRQ(15), IRQ_TYPE_EDGE_RISING);
193 193
194 platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices)); 194 platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
195 omap_board_config = voiceblue_config; 195 omap_board_config = voiceblue_config;
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 0cf62ef5ecb7..d963125ed755 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -181,7 +181,7 @@ void omap1510_fpga_init_irq(void)
181 */ 181 */
182 omap_request_gpio(13); 182 omap_request_gpio(13);
183 omap_set_gpio_direction(13, 1); 183 omap_set_gpio_direction(13, 1);
184 set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); 184 set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
185 set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); 185 set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);
186} 186}
187 187
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 620fa0f120ee..870b34972d3b 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -337,17 +337,17 @@ static void __init apollon_sw_init(void)
337 omap_request_gpio(SW_DOWN_GPIO58); 337 omap_request_gpio(SW_DOWN_GPIO58);
338 omap_set_gpio_direction(SW_DOWN_GPIO58, 1); 338 omap_set_gpio_direction(SW_DOWN_GPIO58, 1);
339 339
340 set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQT_RISING); 340 set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
341 if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt, 341 if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
342 IRQF_SHARED, "enter sw", 342 IRQF_SHARED, "enter sw",
343 &apollon_sw_interrupt)) 343 &apollon_sw_interrupt))
344 return; 344 return;
345 set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQT_RISING); 345 set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING);
346 if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt, 346 if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt,
347 IRQF_SHARED, "up sw", 347 IRQF_SHARED, "up sw",
348 &apollon_sw_interrupt)) 348 &apollon_sw_interrupt))
349 return; 349 return;
350 set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQT_RISING); 350 set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING);
351 if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt, 351 if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt,
352 IRQF_SHARED, "down sw", 352 IRQF_SHARED, "down sw",
353 &apollon_sw_interrupt)) 353 &apollon_sw_interrupt))
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 88405e74e5e3..40a0bee4fbb3 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -213,7 +213,7 @@ void __init db88f5281_pci_preinit(void)
213 pin = DB88F5281_PCI_SLOT0_IRQ_PIN; 213 pin = DB88F5281_PCI_SLOT0_IRQ_PIN;
214 if (gpio_request(pin, "PCI Int1") == 0) { 214 if (gpio_request(pin, "PCI Int1") == 0) {
215 if (gpio_direction_input(pin) == 0) { 215 if (gpio_direction_input(pin) == 0) {
216 set_irq_type(gpio_to_irq(pin), IRQT_LOW); 216 set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
217 } else { 217 } else {
218 printk(KERN_ERR "db88f5281_pci_preinit faield to " 218 printk(KERN_ERR "db88f5281_pci_preinit faield to "
219 "set_irq_type pin %d\n", pin); 219 "set_irq_type pin %d\n", pin);
@@ -226,7 +226,7 @@ void __init db88f5281_pci_preinit(void)
226 pin = DB88F5281_PCI_SLOT1_SLOT2_IRQ_PIN; 226 pin = DB88F5281_PCI_SLOT1_SLOT2_IRQ_PIN;
227 if (gpio_request(pin, "PCI Int2") == 0) { 227 if (gpio_request(pin, "PCI Int2") == 0) {
228 if (gpio_direction_input(pin) == 0) { 228 if (gpio_direction_input(pin) == 0) {
229 set_irq_type(gpio_to_irq(pin), IRQT_LOW); 229 set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
230 } else { 230 } else {
231 printk(KERN_ERR "db88f5281_pci_preinit faield " 231 printk(KERN_ERR "db88f5281_pci_preinit faield "
232 "to set_irq_type pin %d\n", pin); 232 "to set_irq_type pin %d\n", pin);
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c
index e2a0084ab4a3..9ae3f6dc7839 100644
--- a/arch/arm/mach-orion5x/irq.c
+++ b/arch/arm/mach-orion5x/irq.c
@@ -91,27 +91,27 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type)
91 desc = irq_desc + irq; 91 desc = irq_desc + irq;
92 92
93 switch (type) { 93 switch (type) {
94 case IRQT_HIGH: 94 case IRQ_TYPE_LEVEL_HIGH:
95 desc->handle_irq = handle_level_irq; 95 desc->handle_irq = handle_level_irq;
96 desc->status |= IRQ_LEVEL; 96 desc->status |= IRQ_LEVEL;
97 orion5x_clrbits(GPIO_IN_POL, (1 << pin)); 97 orion5x_clrbits(GPIO_IN_POL, (1 << pin));
98 break; 98 break;
99 case IRQT_LOW: 99 case IRQ_TYPE_LEVEL_LOW:
100 desc->handle_irq = handle_level_irq; 100 desc->handle_irq = handle_level_irq;
101 desc->status |= IRQ_LEVEL; 101 desc->status |= IRQ_LEVEL;
102 orion5x_setbits(GPIO_IN_POL, (1 << pin)); 102 orion5x_setbits(GPIO_IN_POL, (1 << pin));
103 break; 103 break;
104 case IRQT_RISING: 104 case IRQ_TYPE_EDGE_RISING:
105 desc->handle_irq = handle_edge_irq; 105 desc->handle_irq = handle_edge_irq;
106 desc->status &= ~IRQ_LEVEL; 106 desc->status &= ~IRQ_LEVEL;
107 orion5x_clrbits(GPIO_IN_POL, (1 << pin)); 107 orion5x_clrbits(GPIO_IN_POL, (1 << pin));
108 break; 108 break;
109 case IRQT_FALLING: 109 case IRQ_TYPE_EDGE_FALLING:
110 desc->handle_irq = handle_edge_irq; 110 desc->handle_irq = handle_edge_irq;
111 desc->status &= ~IRQ_LEVEL; 111 desc->status &= ~IRQ_LEVEL;
112 orion5x_setbits(GPIO_IN_POL, (1 << pin)); 112 orion5x_setbits(GPIO_IN_POL, (1 << pin));
113 break; 113 break;
114 case IRQT_BOTHEDGE: 114 case IRQ_TYPE_EDGE_BOTH:
115 desc->handle_irq = handle_edge_irq; 115 desc->handle_irq = handle_edge_irq;
116 desc->status &= ~IRQ_LEVEL; 116 desc->status &= ~IRQ_LEVEL;
117 /* 117 /*
@@ -156,7 +156,7 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
156 if (cause & (1 << pin)) { 156 if (cause & (1 << pin)) {
157 irq = gpio_to_irq(pin); 157 irq = gpio_to_irq(pin);
158 desc = irq_desc + irq; 158 desc = irq_desc + irq;
159 if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { 159 if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
160 /* Swap polarity (race with GPIO line) */ 160 /* Swap polarity (race with GPIO line) */
161 u32 polarity = readl(GPIO_IN_POL); 161 u32 polarity = readl(GPIO_IN_POL);
162 polarity ^= 1 << pin; 162 polarity ^= 1 << pin;
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 10ae62864269..2a46d27209c1 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -148,7 +148,7 @@ void __init rd88f5182_pci_preinit(void)
148 pin = RD88F5182_PCI_SLOT0_IRQ_A_PIN; 148 pin = RD88F5182_PCI_SLOT0_IRQ_A_PIN;
149 if (gpio_request(pin, "PCI IntA") == 0) { 149 if (gpio_request(pin, "PCI IntA") == 0) {
150 if (gpio_direction_input(pin) == 0) { 150 if (gpio_direction_input(pin) == 0) {
151 set_irq_type(gpio_to_irq(pin), IRQT_LOW); 151 set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
152 } else { 152 } else {
153 printk(KERN_ERR "rd88f5182_pci_preinit faield to " 153 printk(KERN_ERR "rd88f5182_pci_preinit faield to "
154 "set_irq_type pin %d\n", pin); 154 "set_irq_type pin %d\n", pin);
@@ -161,7 +161,7 @@ void __init rd88f5182_pci_preinit(void)
161 pin = RD88F5182_PCI_SLOT0_IRQ_B_PIN; 161 pin = RD88F5182_PCI_SLOT0_IRQ_B_PIN;
162 if (gpio_request(pin, "PCI IntB") == 0) { 162 if (gpio_request(pin, "PCI IntB") == 0) {
163 if (gpio_direction_input(pin) == 0) { 163 if (gpio_direction_input(pin) == 0) {
164 set_irq_type(gpio_to_irq(pin), IRQT_LOW); 164 set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
165 } else { 165 } else {
166 printk(KERN_ERR "rd88f5182_pci_preinit faield to " 166 printk(KERN_ERR "rd88f5182_pci_preinit faield to "
167 "set_irq_type pin %d\n", pin); 167 "set_irq_type pin %d\n", pin);
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index a9cef9703d5b..f270ada2def9 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -117,7 +117,7 @@ void __init qnap_ts209_pci_preinit(void)
117 pin = QNAP_TS209_PCI_SLOT0_IRQ_PIN; 117 pin = QNAP_TS209_PCI_SLOT0_IRQ_PIN;
118 if (gpio_request(pin, "PCI Int1") == 0) { 118 if (gpio_request(pin, "PCI Int1") == 0) {
119 if (gpio_direction_input(pin) == 0) { 119 if (gpio_direction_input(pin) == 0) {
120 set_irq_type(gpio_to_irq(pin), IRQT_LOW); 120 set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
121 } else { 121 } else {
122 printk(KERN_ERR "qnap_ts209_pci_preinit failed to " 122 printk(KERN_ERR "qnap_ts209_pci_preinit failed to "
123 "set_irq_type pin %d\n", pin); 123 "set_irq_type pin %d\n", pin);
@@ -131,7 +131,7 @@ void __init qnap_ts209_pci_preinit(void)
131 pin = QNAP_TS209_PCI_SLOT1_IRQ_PIN; 131 pin = QNAP_TS209_PCI_SLOT1_IRQ_PIN;
132 if (gpio_request(pin, "PCI Int2") == 0) { 132 if (gpio_request(pin, "PCI Int2") == 0) {
133 if (gpio_direction_input(pin) == 0) { 133 if (gpio_direction_input(pin) == 0) {
134 set_irq_type(gpio_to_irq(pin), IRQT_LOW); 134 set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
135 } else { 135 } else {
136 printk(KERN_ERR "qnap_ts209_pci_preinit failed " 136 printk(KERN_ERR "qnap_ts209_pci_preinit failed "
137 "to set_irq_type pin %d\n", pin); 137 "to set_irq_type pin %d\n", pin);
diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c
index 968d0b027597..5ed67e1947a8 100644
--- a/arch/arm/mach-pnx4008/irq.c
+++ b/arch/arm/mach-pnx4008/irq.c
@@ -56,28 +56,28 @@ static void pnx4008_mask_ack_irq(unsigned int irq)
56static int pnx4008_set_irq_type(unsigned int irq, unsigned int type) 56static int pnx4008_set_irq_type(unsigned int irq, unsigned int type)
57{ 57{
58 switch (type) { 58 switch (type) {
59 case IRQT_RISING: 59 case IRQ_TYPE_EDGE_RISING:
60 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq)); /*edge sensitive */ 60 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq)); /*edge sensitive */
61 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq)); /*rising edge */ 61 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq)); /*rising edge */
62 set_irq_handler(irq, handle_edge_irq); 62 set_irq_handler(irq, handle_edge_irq);
63 break; 63 break;
64 case IRQT_FALLING: 64 case IRQ_TYPE_EDGE_FALLING:
65 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq)); /*edge sensitive */ 65 __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq)); /*edge sensitive */
66 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq)); /*falling edge */ 66 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq)); /*falling edge */
67 set_irq_handler(irq, handle_edge_irq); 67 set_irq_handler(irq, handle_edge_irq);
68 break; 68 break;
69 case IRQT_LOW: 69 case IRQ_TYPE_LEVEL_LOW:
70 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq)); /*level sensitive */ 70 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq)); /*level sensitive */
71 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq)); /*low level */ 71 __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq)); /*low level */
72 set_irq_handler(irq, handle_level_irq); 72 set_irq_handler(irq, handle_level_irq);
73 break; 73 break;
74 case IRQT_HIGH: 74 case IRQ_TYPE_LEVEL_HIGH:
75 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq)); /*level sensitive */ 75 __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq)); /*level sensitive */
76 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq)); /* high level */ 76 __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq)); /* high level */
77 set_irq_handler(irq, handle_level_irq); 77 set_irq_handler(irq, handle_level_irq);
78 break; 78 break;
79 79
80 /* IRQT_BOTHEDGE is not supported */ 80 /* IRQ_TYPE_EDGE_BOTH is not supported */
81 default: 81 default:
82 printk(KERN_ERR "PNX4008 IRQ: Unsupported irq type %d\n", type); 82 printk(KERN_ERR "PNX4008 IRQ: Unsupported irq type %d\n", type);
83 return -1; 83 return -1;
diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
index bcf0cde6ccc9..31f5bd411ced 100644
--- a/arch/arm/mach-pxa/cm-x270-pci.c
+++ b/arch/arm/mach-pxa/cm-x270-pci.c
@@ -71,7 +71,7 @@ void __cmx270_pci_init_irq(int irq_gpio)
71 71
72 cmx270_it8152_irq_gpio = irq_gpio; 72 cmx270_it8152_irq_gpio = irq_gpio;
73 73
74 set_irq_type(gpio_to_irq(irq_gpio), IRQT_RISING); 74 set_irq_type(gpio_to_irq(irq_gpio), IRQ_TYPE_EDGE_RISING);
75 75
76 set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux); 76 set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux);
77} 77}
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index cc1c4fa06145..8d1ab54e7b20 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -113,7 +113,7 @@ static void __init lpd270_init_irq(void)
113 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); 113 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
114 } 114 }
115 set_irq_chained_handler(IRQ_GPIO(0), lpd270_irq_handler); 115 set_irq_chained_handler(IRQ_GPIO(0), lpd270_irq_handler);
116 set_irq_type(IRQ_GPIO(0), IRQT_FALLING); 116 set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
117} 117}
118 118
119 119
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index ac26423cd20c..af7375bb46a4 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -152,7 +152,7 @@ static void __init lubbock_init_irq(void)
152 } 152 }
153 153
154 set_irq_chained_handler(IRQ_GPIO(0), lubbock_irq_handler); 154 set_irq_chained_handler(IRQ_GPIO(0), lubbock_irq_handler);
155 set_irq_type(IRQ_GPIO(0), IRQT_FALLING); 155 set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
156} 156}
157 157
158#ifdef CONFIG_PM 158#ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 851ec2d9b699..c8e38b5ff1c4 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -191,7 +191,7 @@ static void __init mainstone_init_irq(void)
191 MST_INTSETCLR = 0; 191 MST_INTSETCLR = 0;
192 192
193 set_irq_chained_handler(IRQ_GPIO(0), mainstone_irq_handler); 193 set_irq_chained_handler(IRQ_GPIO(0), mainstone_irq_handler);
194 set_irq_type(IRQ_GPIO(0), IRQT_FALLING); 194 set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
195} 195}
196 196
197#ifdef CONFIG_PM 197#ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 34cd585075b0..23e9b9283301 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -146,18 +146,18 @@ void sharpsl_pm_pxa_init(void)
146 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED, "AC Input Detect", sharpsl_ac_isr)) { 146 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED, "AC Input Detect", sharpsl_ac_isr)) {
147 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin)); 147 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin));
148 } 148 }
149 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQT_BOTHEDGE); 149 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQ_TYPE_EDGE_BOTH);
150 150
151 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED, "Battery Cover", sharpsl_fatal_isr)) { 151 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED, "Battery Cover", sharpsl_fatal_isr)) {
152 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock)); 152 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock));
153 } 153 }
154 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQT_FALLING); 154 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQ_TYPE_EDGE_FALLING);
155 155
156 if (sharpsl_pm.machinfo->gpio_fatal) { 156 if (sharpsl_pm.machinfo->gpio_fatal) {
157 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED, "Fatal Battery", sharpsl_fatal_isr)) { 157 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED, "Fatal Battery", sharpsl_fatal_isr)) {
158 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal)); 158 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal));
159 } 159 }
160 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQT_FALLING); 160 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQ_TYPE_EDGE_FALLING);
161 } 161 }
162 162
163 if (sharpsl_pm.machinfo->batfull_irq) 163 if (sharpsl_pm.machinfo->batfull_irq)
@@ -166,7 +166,7 @@ void sharpsl_pm_pxa_init(void)
166 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED, "CO", sharpsl_chrg_full_isr)) { 166 if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED, "CO", sharpsl_chrg_full_isr)) {
167 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull)); 167 dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull));
168 } 168 }
169 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQT_RISING); 169 else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQ_TYPE_EDGE_RISING);
170 } 170 }
171} 171}
172 172
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index dee7bf36f013..12811b7aea07 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -122,7 +122,7 @@ static struct resource dm9000_resources[] = {
122 [2] = { 122 [2] = {
123 .start = TRIZEPS4_ETH_IRQ, 123 .start = TRIZEPS4_ETH_IRQ,
124 .end = TRIZEPS4_ETH_IRQ, 124 .end = TRIZEPS4_ETH_IRQ,
125 .flags = (IORESOURCE_IRQ | IRQT_RISING), 125 .flags = (IORESOURCE_IRQ | IRQ_TYPE_EDGE_RISING),
126 }, 126 },
127}; 127};
128 128
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 31afe50d7cd5..56d3ee01baae 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -96,7 +96,7 @@ static struct resource cerf_flash_resource = {
96static void __init cerf_init_irq(void) 96static void __init cerf_init_irq(void)
97{ 97{
98 sa1100_init_irq(); 98 sa1100_init_irq();
99 set_irq_type(CERF_ETH_IRQ, IRQT_RISING); 99 set_irq_type(CERF_ETH_IRQ, IRQ_TYPE_EDGE_RISING);
100} 100}
101 101
102static struct map_desc cerf_io_desc[] __initdata = { 102static struct map_desc cerf_io_desc[] __initdata = {
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 8473c37b77d6..b34ff42bbd75 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -834,7 +834,7 @@ static void __init h3800_init_irq(void)
834 set_irq_chip(irq, &h3800_gpio_irqchip); 834 set_irq_chip(irq, &h3800_gpio_irqchip);
835 } 835 }
836#endif 836#endif
837 set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING); 837 set_irq_type(IRQ_GPIO_H3800_ASIC, IRQ_TYPE_EDGE_RISING);
838 set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux); 838 set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);
839} 839}
840 840
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index fa0403af7eec..c5e438b12ec7 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -46,17 +46,17 @@ static int sa1100_gpio_type(unsigned int irq, unsigned int type)
46 else 46 else
47 mask = GPIO11_27_MASK(irq); 47 mask = GPIO11_27_MASK(irq);
48 48
49 if (type == IRQT_PROBE) { 49 if (type == IRQ_TYPE_PROBE) {
50 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask) 50 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
51 return 0; 51 return 0;
52 type = __IRQT_RISEDGE | __IRQT_FALEDGE; 52 type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
53 } 53 }
54 54
55 if (type & __IRQT_RISEDGE) { 55 if (type & IRQ_TYPE_EDGE_RISING) {
56 GPIO_IRQ_rising_edge |= mask; 56 GPIO_IRQ_rising_edge |= mask;
57 } else 57 } else
58 GPIO_IRQ_rising_edge &= ~mask; 58 GPIO_IRQ_rising_edge &= ~mask;
59 if (type & __IRQT_FALEDGE) { 59 if (type & IRQ_TYPE_EDGE_FALLING) {
60 GPIO_IRQ_falling_edge |= mask; 60 GPIO_IRQ_falling_edge |= mask;
61 } else 61 } else
62 GPIO_IRQ_falling_edge &= ~mask; 62 GPIO_IRQ_falling_edge &= ~mask;
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 9f1ed1509301..967a48454f6b 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -151,7 +151,7 @@ static int __devinit neponset_probe(struct platform_device *dev)
151 /* 151 /*
152 * Install handler for GPIO25. 152 * Install handler for GPIO25.
153 */ 153 */
154 set_irq_type(IRQ_GPIO25, IRQT_RISING); 154 set_irq_type(IRQ_GPIO25, IRQ_TYPE_EDGE_RISING);
155 set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler); 155 set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler);
156 156
157 /* 157 /*
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index c7bf7e0038f0..69a71f11625e 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -143,7 +143,7 @@ static void __init pleb_map_io(void)
143 143
144 GPDR &= ~GPIO_ETH0_IRQ; 144 GPDR &= ~GPIO_ETH0_IRQ;
145 145
146 set_irq_type(GPIO_ETH0_IRQ, IRQT_FALLING); 146 set_irq_type(GPIO_ETH0_IRQ, IRQ_TYPE_EDGE_FALLING);
147} 147}
148 148
149MACHINE_START(PLEB, "PLEB") 149MACHINE_START(PLEB, "PLEB")
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index fbfa26058442..a8ec97b4752e 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -37,7 +37,7 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)
37 pgd_t *pgd; 37 pgd_t *pgd;
38 pmd_t *pmd; 38 pmd_t *pmd;
39 pte_t *pte, entry; 39 pte_t *pte, entry;
40 int ret = 0; 40 int ret;
41 41
42 pgd = pgd_offset(vma->vm_mm, address); 42 pgd = pgd_offset(vma->vm_mm, address);
43 if (pgd_none(*pgd)) 43 if (pgd_none(*pgd))
@@ -55,15 +55,19 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)
55 entry = *pte; 55 entry = *pte;
56 56
57 /* 57 /*
58 * If this page is present, it's actually being shared.
59 */
60 ret = pte_present(entry);
61
62 /*
58 * If this page isn't present, or is already setup to 63 * If this page isn't present, or is already setup to
59 * fault (ie, is old), we can safely ignore any issues. 64 * fault (ie, is old), we can safely ignore any issues.
60 */ 65 */
61 if (pte_present(entry) && pte_val(entry) & shared_pte_mask) { 66 if (ret && pte_val(entry) & shared_pte_mask) {
62 flush_cache_page(vma, address, pte_pfn(entry)); 67 flush_cache_page(vma, address, pte_pfn(entry));
63 pte_val(entry) &= ~shared_pte_mask; 68 pte_val(entry) &= ~shared_pte_mask;
64 set_pte_at(vma->vm_mm, address, pte, entry); 69 set_pte_at(vma->vm_mm, address, pte, entry);
65 flush_tlb_page(vma, address); 70 flush_tlb_page(vma, address);
66 ret = 1;
67 } 71 }
68 pte_unmap(pte); 72 pte_unmap(pte);
69 return ret; 73 return ret;
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index 4a7736717d86..318b268f938e 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -73,19 +73,19 @@ static int gpio_set_irq_type(u32 irq, u32 type)
73 void __iomem *reg = port->base; 73 void __iomem *reg = port->base;
74 74
75 switch (type) { 75 switch (type) {
76 case IRQT_RISING: 76 case IRQ_TYPE_EDGE_RISING:
77 edge = GPIO_INT_RISE_EDGE; 77 edge = GPIO_INT_RISE_EDGE;
78 break; 78 break;
79 case IRQT_FALLING: 79 case IRQ_TYPE_EDGE_FALLING:
80 edge = GPIO_INT_FALL_EDGE; 80 edge = GPIO_INT_FALL_EDGE;
81 break; 81 break;
82 case IRQT_LOW: 82 case IRQ_TYPE_LEVEL_LOW:
83 edge = GPIO_INT_LOW_LEV; 83 edge = GPIO_INT_LOW_LEV;
84 break; 84 break;
85 case IRQT_HIGH: 85 case IRQ_TYPE_LEVEL_HIGH:
86 edge = GPIO_INT_HIGH_LEV; 86 edge = GPIO_INT_HIGH_LEV;
87 break; 87 break;
88 default: /* this includes IRQT_BOTHEDGE */ 88 default: /* this includes IRQ_TYPE_EDGE_BOTH */
89 return -EINVAL; 89 return -EINVAL;
90 } 90 }
91 91
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index d8e9c2c3f0f6..63e094342ef6 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -517,13 +517,13 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
517 u32 gpio_bit = 1 << gpio; 517 u32 gpio_bit = 1 << gpio;
518 518
519 MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT0, gpio_bit, 519 MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT0, gpio_bit,
520 trigger & __IRQT_LOWLVL); 520 trigger & IRQ_TYPE_LEVEL_LOW);
521 MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT1, gpio_bit, 521 MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT1, gpio_bit,
522 trigger & __IRQT_HIGHLVL); 522 trigger & IRQ_TYPE_LEVEL_HIGH);
523 MOD_REG_BIT(OMAP24XX_GPIO_RISINGDETECT, gpio_bit, 523 MOD_REG_BIT(OMAP24XX_GPIO_RISINGDETECT, gpio_bit,
524 trigger & __IRQT_RISEDGE); 524 trigger & IRQ_TYPE_EDGE_RISING);
525 MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit, 525 MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit,
526 trigger & __IRQT_FALEDGE); 526 trigger & IRQ_TYPE_EDGE_FALLING);
527 527
528 if (likely(!(bank->non_wakeup_gpios & gpio_bit))) { 528 if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {
529 if (trigger != 0) 529 if (trigger != 0)
@@ -555,9 +555,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
555 case METHOD_MPUIO: 555 case METHOD_MPUIO:
556 reg += OMAP_MPUIO_GPIO_INT_EDGE; 556 reg += OMAP_MPUIO_GPIO_INT_EDGE;
557 l = __raw_readl(reg); 557 l = __raw_readl(reg);
558 if (trigger & __IRQT_RISEDGE) 558 if (trigger & IRQ_TYPE_EDGE_RISING)
559 l |= 1 << gpio; 559 l |= 1 << gpio;
560 else if (trigger & __IRQT_FALEDGE) 560 else if (trigger & IRQ_TYPE_EDGE_FALLING)
561 l &= ~(1 << gpio); 561 l &= ~(1 << gpio);
562 else 562 else
563 goto bad; 563 goto bad;
@@ -567,9 +567,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
567 case METHOD_GPIO_1510: 567 case METHOD_GPIO_1510:
568 reg += OMAP1510_GPIO_INT_CONTROL; 568 reg += OMAP1510_GPIO_INT_CONTROL;
569 l = __raw_readl(reg); 569 l = __raw_readl(reg);
570 if (trigger & __IRQT_RISEDGE) 570 if (trigger & IRQ_TYPE_EDGE_RISING)
571 l |= 1 << gpio; 571 l |= 1 << gpio;
572 else if (trigger & __IRQT_FALEDGE) 572 else if (trigger & IRQ_TYPE_EDGE_FALLING)
573 l &= ~(1 << gpio); 573 l &= ~(1 << gpio);
574 else 574 else
575 goto bad; 575 goto bad;
@@ -584,9 +584,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
584 gpio &= 0x07; 584 gpio &= 0x07;
585 l = __raw_readl(reg); 585 l = __raw_readl(reg);
586 l &= ~(3 << (gpio << 1)); 586 l &= ~(3 << (gpio << 1));
587 if (trigger & __IRQT_RISEDGE) 587 if (trigger & IRQ_TYPE_EDGE_RISING)
588 l |= 2 << (gpio << 1); 588 l |= 2 << (gpio << 1);
589 if (trigger & __IRQT_FALEDGE) 589 if (trigger & IRQ_TYPE_EDGE_FALLING)
590 l |= 1 << (gpio << 1); 590 l |= 1 << (gpio << 1);
591 if (trigger) 591 if (trigger)
592 /* Enable wake-up during idle for dynamic tick */ 592 /* Enable wake-up during idle for dynamic tick */
@@ -599,9 +599,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
599 case METHOD_GPIO_730: 599 case METHOD_GPIO_730:
600 reg += OMAP730_GPIO_INT_CONTROL; 600 reg += OMAP730_GPIO_INT_CONTROL;
601 l = __raw_readl(reg); 601 l = __raw_readl(reg);
602 if (trigger & __IRQT_RISEDGE) 602 if (trigger & IRQ_TYPE_EDGE_RISING)
603 l |= 1 << gpio; 603 l |= 1 << gpio;
604 else if (trigger & __IRQT_FALEDGE) 604 else if (trigger & IRQ_TYPE_EDGE_FALLING)
605 l &= ~(1 << gpio); 605 l &= ~(1 << gpio);
606 else 606 else
607 goto bad; 607 goto bad;
@@ -887,7 +887,7 @@ static void _reset_gpio(struct gpio_bank *bank, int gpio)
887 _set_gpio_direction(bank, get_gpio_index(gpio), 1); 887 _set_gpio_direction(bank, get_gpio_index(gpio), 1);
888 _set_gpio_irqenable(bank, gpio, 0); 888 _set_gpio_irqenable(bank, gpio, 0);
889 _clear_gpio_irqstatus(bank, gpio); 889 _clear_gpio_irqstatus(bank, gpio);
890 _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE); 890 _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
891} 891}
892 892
893/* Use disable_irq_wake() and enable_irq_wake() functions from drivers */ 893/* Use disable_irq_wake() and enable_irq_wake() functions from drivers */
@@ -924,7 +924,7 @@ int omap_request_gpio(int gpio)
924 /* Set trigger to none. You need to enable the desired trigger with 924 /* Set trigger to none. You need to enable the desired trigger with
925 * request_irq() or set_irq_type(). 925 * request_irq() or set_irq_type().
926 */ 926 */
927 _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE); 927 _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
928 928
929#ifdef CONFIG_ARCH_OMAP15XX 929#ifdef CONFIG_ARCH_OMAP15XX
930 if (bank->method == METHOD_GPIO_1510) { 930 if (bank->method == METHOD_GPIO_1510) {
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 5e28c217b8c2..0af3872fb763 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -9,7 +9,7 @@ config PLAT_S3C24XX
9 depends on ARCH_S3C2410 9 depends on ARCH_S3C2410
10 default y if ARCH_S3C2410 10 default y if ARCH_S3C2410
11 select NO_IOPORT 11 select NO_IOPORT
12 select HAVE_GPIO_LIB 12 select ARCH_REQUIRE_GPIOLIB
13 help 13 help
14 Base platform code for any Samsung S3C24XX device 14 Base platform code for any Samsung S3C24XX device
15 15
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index ae2c5d7efc9d..001436c04b13 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -292,27 +292,27 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
292 /* Set the external interrupt to pointed trigger type */ 292 /* Set the external interrupt to pointed trigger type */
293 switch (type) 293 switch (type)
294 { 294 {
295 case IRQT_NOEDGE: 295 case IRQ_TYPE_NONE:
296 printk(KERN_WARNING "No edge setting!\n"); 296 printk(KERN_WARNING "No edge setting!\n");
297 break; 297 break;
298 298
299 case IRQT_RISING: 299 case IRQ_TYPE_EDGE_RISING:
300 newvalue = S3C2410_EXTINT_RISEEDGE; 300 newvalue = S3C2410_EXTINT_RISEEDGE;
301 break; 301 break;
302 302
303 case IRQT_FALLING: 303 case IRQ_TYPE_EDGE_FALLING:
304 newvalue = S3C2410_EXTINT_FALLEDGE; 304 newvalue = S3C2410_EXTINT_FALLEDGE;
305 break; 305 break;
306 306
307 case IRQT_BOTHEDGE: 307 case IRQ_TYPE_EDGE_BOTH:
308 newvalue = S3C2410_EXTINT_BOTHEDGE; 308 newvalue = S3C2410_EXTINT_BOTHEDGE;
309 break; 309 break;
310 310
311 case IRQT_LOW: 311 case IRQ_TYPE_LEVEL_LOW:
312 newvalue = S3C2410_EXTINT_LOWLEV; 312 newvalue = S3C2410_EXTINT_LOWLEV;
313 break; 313 break;
314 314
315 case IRQT_HIGH: 315 case IRQ_TYPE_LEVEL_HIGH:
316 newvalue = S3C2410_EXTINT_HILEV; 316 newvalue = S3C2410_EXTINT_HILEV;
317 break; 317 break;
318 318
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index f67e93441caf..a7010c3a377a 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -456,9 +456,6 @@ is386: movl $2,%ecx # set MP
4561: 4561:
457#endif /* CONFIG_SMP */ 457#endif /* CONFIG_SMP */
458 jmp *(initial_code) 458 jmp *(initial_code)
459.align 4
460ENTRY(initial_code)
461 .long i386_start_kernel
462 459
463/* 460/*
464 * We depend on ET to be correct. This checks for 287/387. 461 * We depend on ET to be correct. This checks for 287/387.
@@ -601,6 +598,11 @@ ignore_int:
601#endif 598#endif
602 iret 599 iret
603 600
601.section .cpuinit.data,"wa"
602.align 4
603ENTRY(initial_code)
604 .long i386_start_kernel
605
604.section .text 606.section .text
605/* 607/*
606 * Real beginning of normal "text" segment 608 * Real beginning of normal "text" segment
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-22 10:06:25 -0500