Menu
▾
▴
linux-apus-devel
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(210) |
Jun
(169) |
Jul
(167) |
Aug
(128) |
Sep
(218) |
Oct
(120) |
Nov
(86) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(91) |
Feb
(179) |
Mar
(52) |
Apr
(56) |
May
(183) |
Jun
(62) |
Jul
(63) |
Aug
(49) |
Sep
(36) |
Oct
(35) |
Nov
(72) |
Dec
(30) |
| 2002 |
Jan
(53) |
Feb
(61) |
Mar
(56) |
Apr
(13) |
May
(1) |
Jun
(7) |
Jul
(80) |
Aug
(73) |
Sep
(30) |
Oct
(29) |
Nov
(8) |
Dec
(40) |
| 2003 |
Jan
(10) |
Feb
(2) |
Mar
(4) |
Apr
(9) |
May
(3) |
Jun
(19) |
Jul
(64) |
Aug
(53) |
Sep
(28) |
Oct
(7) |
Nov
(3) |
Dec
(21) |
| 2004 |
Jan
(11) |
Feb
(30) |
Mar
(18) |
Apr
(1) |
May
(13) |
Jun
(18) |
Jul
(13) |
Aug
|
Sep
(9) |
Oct
(5) |
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
(21) |
Sep
(7) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2006 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(6) |
Oct
(10) |
Nov
(8) |
Dec
(3) |
| 2007 |
Jan
(3) |
Feb
(6) |
Mar
(1) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(13) |
Aug
(8) |
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: John W. L. <lin...@tu...> - 2005-08-02 01:23:16
|
On Mon, Aug 01, 2005 at 09:08:55PM +0200, Roman Zippel wrote: > On Mon, 1 Aug 2005, John W. Linville wrote: > Anyway, please hold off with patches for a few days, some of these thing > are already fixed in my tree and I want to test them first before I commit > them. Just trying to help...let me know if I can be of service... > > I noticed that "__asm__ __volatile__" seems to be > redundant, so I prefer them without underscores. Fine by me...there is certainly no shortage of either variation in the kernel sources. :-) John -- John W. Linville lin...@tu... |
|
From: Roman Z. <zi...@li...> - 2005-08-01 19:09:15
|
Hi, On Mon, 1 Aug 2005, John W. Linville wrote: > Actually, the warnings were specifically with the arguments in the > write routines. My compiler actually produced errors here, but I fixed differently here. Anyway, please hold off with patches for a few days, some of these thing are already fixed in my tree and I want to test them first before I commit them. > I noticed that "__asm__ __volatile__" seems to be > the more common usage , so I just changed it for consistency in all > the routines. Is this problematic? > > Is there a meaningful difference between the two? There is only a difference if you want to compile the source with the -ansi switch, which is pointless for the kernel and what makes them redundant, so I prefer them without underscores. bye, Roman |
|
From: John W. L. <lin...@tu...> - 2005-08-01 11:37:20
|
On Mon, Aug 01, 2005 at 07:57:42AM +0200, Geert Uytterhoeven wrote:
> On Sun, 31 Jul 2005, John W. Linville wrote:
> > Fix-up some basic compile failures related to APUS.
> >
> > Signed-off-by: John W. Linville <lin...@tu...>
> > ---
> > The "asm volatile" fixes in zorro.h were actually warning fix-ups, but
> > easier to just include all the fixes for that file in one patch...
> >
> > arch/ppc/kernel/head.S | 4 ++--
> > include/asm-ppc/zorro.h | 37 +++++++++++++++++--------------------
> > 2 files changed, 19 insertions(+), 22 deletions(-)
> >
> > --- linux-apus/include/asm-ppc/zorro.h.orig 2005-07-31 14:18:57.000000000 -0400
> > +++ linux-apus/include/asm-ppc/zorro.h 2005-07-31 14:36:47.000000000 -0400
> > @@ -7,8 +7,8 @@ static inline unsigned int z_readb(unsig
> > {
> > unsigned int ret;
> >
> > - asm volatile ("lbz%U1%X1 %0,%1; eieio"
> > - : "=r" (ret) : "m" (*(unsigned char *)addr));
> > + __asm__ __volatile__ ("lbz%U1%X1 %0,%1; eieio"
> > + : "=r" (ret) : "m" (*(unsigned char *)addr));
>
> What warning do you get with the `asm volatile'?
Actually, the warnings were specifically with the arguments in the
write routines. I noticed that "__asm__ __volatile__" seems to be
the more common usage , so I just changed it for consistency in all
the routines. Is this problematic?
Is there a meaningful difference between the two? I just presumed that
"asm volatile" was an older version of the same thing? Feel free to
correct me...
John
--
John W. Linville
lin...@tu...
|
|
From: Sven L. <sve...@wa...> - 2005-08-01 09:47:18
|
On Sun, Jul 31, 2005 at 10:46:35AM +0100, A.L...@lb... wrote: > Hi, > > there was a recent report that the latest kernels arent compiling on APUS - > I havent had time to chase this up - but can anyone give more details? Mmm, what is the status of the 2.6 apus patch set, and can we integrate it into the mainline kernel, or at least have a patch which doesn't break the other ppc subarches ? Current debian 2.6.12 kernel has no apus support, but i want to have this fixed nextly, if possible. I know Simon was working on so,me apus patches at deconf'05, but i am not sure if it ever got anywhere. Anyway, thanks to Roman for importing the new upstream stuff, and i will try to generate a patch out of it in the next days, and to try to build it. Friendly, Sven Luther |
|
From: Geert U. <ge...@li...> - 2005-08-01 05:59:35
|
On Sun, 31 Jul 2005, John W. Linville wrote:
> +CONFIG_ABSTRACT_CONSOLE=y
Wow, is it still there?
I'm quite sure CONFIG_ABSTRACT_CONSOLE can be removed from arch/ppc/Kconfig as
well.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
|
|
From: Geert U. <ge...@li...> - 2005-08-01 05:58:13
|
On Sun, 31 Jul 2005, John W. Linville wrote:
> Fix-up some basic compile failures related to APUS.
>
> Signed-off-by: John W. Linville <lin...@tu...>
> ---
> The "asm volatile" fixes in zorro.h were actually warning fix-ups, but
> easier to just include all the fixes for that file in one patch...
>
> arch/ppc/kernel/head.S | 4 ++--
> include/asm-ppc/zorro.h | 37 +++++++++++++++++--------------------
> 2 files changed, 19 insertions(+), 22 deletions(-)
>
> --- linux-apus/include/asm-ppc/zorro.h.orig 2005-07-31 14:18:57.000000000 -0400
> +++ linux-apus/include/asm-ppc/zorro.h 2005-07-31 14:36:47.000000000 -0400
> @@ -7,8 +7,8 @@ static inline unsigned int z_readb(unsig
> {
> unsigned int ret;
>
> - asm volatile ("lbz%U1%X1 %0,%1; eieio"
> - : "=r" (ret) : "m" (*(unsigned char *)addr));
> + __asm__ __volatile__ ("lbz%U1%X1 %0,%1; eieio"
> + : "=r" (ret) : "m" (*(unsigned char *)addr));
What warning do you get with the `asm volatile'?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
|
|
From: John W. L. <lin...@tu...> - 2005-08-01 01:25:35
|
Fix-up some basic compile failures related to APUS.
Signed-off-by: John W. Linville <lin...@tu...>
---
The "asm volatile" fixes in zorro.h were actually warning fix-ups, but
easier to just include all the fixes for that file in one patch...
arch/ppc/kernel/head.S | 4 ++--
include/asm-ppc/zorro.h | 37 +++++++++++++++++--------------------
2 files changed, 19 insertions(+), 22 deletions(-)
--- linux-apus/include/asm-ppc/zorro.h.orig 2005-07-31 14:18:57.000000000 -0400
+++ linux-apus/include/asm-ppc/zorro.h 2005-07-31 14:36:47.000000000 -0400
@@ -7,8 +7,8 @@ static inline unsigned int z_readb(unsig
{
unsigned int ret;
- asm volatile ("lbz%U1%X1 %0,%1; eieio"
- : "=r" (ret) : "m" (*(unsigned char *)addr));
+ __asm__ __volatile__ ("lbz%U1%X1 %0,%1; eieio"
+ : "=r" (ret) : "m" (*(unsigned char *)addr));
return ret;
}
@@ -16,7 +16,7 @@ static inline unsigned int z_readw(unsig
{
unsigned int ret;
- asm volatile ("lhz%U1%X1 %0,%1; eieio"
+ __asm__ __volatile__ ("lhz%U1%X1 %0,%1; eieio"
: "=r" (ret) : "m" (*(unsigned short *)addr));
return ret;
}
@@ -25,42 +25,39 @@ static inline unsigned int z_readl(unsig
{
unsigned int ret;
- asm volatile ("lwz%U1%X1 %0,%1; eieio"
+ __asm__ __volatile__ ("lwz%U1%X1 %0,%1; eieio"
: "=r" (ret) : "m" (*(unsigned int *)addr));
return ret;
}
static inline void z_writeb(unsigned int val, unsigned long addr)
{
- asm volatile ("stb%U0%X0 %1,%0; eieio"
- : "=m" (*(unsigned char *)addr) : "r" (val));
+ volatile unsigned char *data = (unsigned char *)addr;
+
+ __asm__ __volatile__ ("stb%U0%X0 %1,%0; eieio"
+ : "=m" (*data) : "r" (val));
}
static inline void z_writew(unsigned int val, unsigned long addr)
{
- asm volatile ("sth%U0%X0 %1,%0; eieio"
- : "=m" (*(unsigned short *)addr) : "r" (val));
+ volatile unsigned short *data = (unsigned short *)addr;
+
+ __asm__ __volatile__ ("sth%U0%X0 %1,%0; eieio"
+ : "=m" (*data) : "r" (val));
}
-static inline void z_writel(unsigned int val,unsigned long addr)
+static inline void z_writel(unsigned int val, unsigned long addr)
{
- asm volatile ("stw%U0%X0 %1,%0; eieio"
- : "=m" (*(unsigned int *)addr) : "r" (val));
+ volatile unsigned long *data = (unsigned long *)addr;
+
+ __asm__ __volatile__ ("stw%U0%X0 %1,%0; eieio"
+ : "=m" (*data) : "r" (val));
}
#define z_memset_io(a,b,c) memset((void *)(a),(b),(c))
#define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
#define z_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
-extern void *__ioremap(unsigned long address, unsigned long size,
- unsigned long flags);
-
-extern void *ioremap(unsigned long address, unsigned long size);
-extern void iounmap(void *addr);
-
-extern void *__ioremap(unsigned long address, unsigned long size,
- unsigned long flags);
-
#define z_ioremap ioremap
#define z_iounmap iounmap
--- linux-apus/arch/ppc/kernel/head.S.orig 2005-07-31 14:16:19.000000000 -0400
+++ linux-apus/arch/ppc/kernel/head.S 2005-07-31 14:16:31.000000000 -0400
@@ -355,11 +355,11 @@ i##n: \
b __secondary_start_gemini
#elif defined(CONFIG_APUS)
. = 0x100
- mfspr r4,HID0
+ mfspr r4,SPRN_HID0
li r3,0
ori r3,r3,0xc000
andc r4,r4,r3
- mtspr HID0,r4
+ mtspr SPRN_HID0,r4
isync
sync
lis r8,0x6170
--
John W. Linville
lin...@tu...
|
|
From: John W. L. <lin...@tu...> - 2005-08-01 01:19:37
|
On Sun, Jul 31, 2005 at 10:46:35AM +0100, A.L...@lb... wrote: > there was a recent report that the latest kernels arent compiling on APUS - > I havent had time to chase this up - but can anyone give more details? The upstream APUS board support is no longer compiling, and is in danger of being removed from the upstream kernels. It looks like Roman is taking steps to prevent that. :-) I was in the process of doing the same thing. I'll follow-up with some patches on top of what is current in CVS, in case they are helpful. John -- John W. Linville lin...@tu... |
|
From: John W. L. <lin...@tu...> - 2005-08-01 01:15:38
|
Fix-up a bunch of APUS-related compiler warnings.
Signed-off-by: John W. Linville <lin...@tu...>
---
Some of these are probably just pedantic fixups. Others might actually
being restoring functionality lost in some unknown round of previous
changes. Either way, I think they are all reasonable...
There is still a warning in drivers/video/amifb.c that I wasn't sure
how to fix. It looks like someone is doing a 16-bit shift inside a
16-bit wide value...? Hopefully someone else knows what it is supposed
to be doing.
arch/ppc/mm/pgtable.c | 2 +-
arch/ppc/platforms/apus_pci.c | 6 +++---
arch/ppc/platforms/apus_setup.c | 6 ++++++
drivers/block/z2ram.c | 2 +-
drivers/net/8390.h | 8 ++++----
drivers/net/apne.c | 3 ++-
drivers/scsi/NCR53C9x.c | 4 ++++
drivers/scsi/wd33c93.c | 1 +
sound/oss/dmasound/dmasound_paula.c | 7 ++++---
10 files changed, 29 insertions(+), 16 deletions(-)
--- linux-apus/sound/oss/dmasound/dmasound_paula.c.orig 2005-07-31 15:26:18.000000000 -0400
+++ linux-apus/sound/oss/dmasound/dmasound_paula.c 2005-07-31 15:28:24.000000000 -0400
@@ -246,6 +246,7 @@ static ssize_t funcname(const u_char *us
{ \
ssize_t count, used; \
u_short data; \
+ u_short *user_data = (u_short *)userPtr; \
\
if (!dmasound.soft.stereo) { \
u_char *high = &frame[*frameUsed>>1]; \
@@ -253,7 +254,7 @@ static ssize_t funcname(const u_char *us
count = min_t(size_t, userCount, frameLeft)>>1 & ~1; \
used = count*2; \
while (count > 0) { \
- if (get_user(data, ((u_short *)userPtr)++)) \
+ if (get_user(data, user_data++)) \
return -EFAULT; \
data = convsample(data); \
*high++ = data>>8; \
@@ -268,12 +269,12 @@ static ssize_t funcname(const u_char *us
count = min_t(size_t, userCount, frameLeft)>>2 & ~1; \
used = count*4; \
while (count > 0) { \
- if (get_user(data, ((u_short *)userPtr)++)) \
+ if (get_user(data, user_data++)) \
return -EFAULT; \
data = convsample(data); \
*lefth++ = data>>8; \
*leftl++ = (data>>2) & 0x3f; \
- if (get_user(data, ((u_short *)userPtr)++)) \
+ if (get_user(data, user_data++)) \
return -EFAULT; \
data = convsample(data); \
*righth++ = data>>8; \
--- linux-apus/drivers/block/z2ram.c.orig 2005-07-31 15:51:47.000000000 -0400
+++ linux-apus/drivers/block/z2ram.c 2005-07-31 15:54:11.000000000 -0400
@@ -78,7 +78,7 @@ static void do_z2_request(request_queue_
unsigned long len = req->current_nr_sectors << 9;
if (start + len > z2ram_size) {
- printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
+ printk( KERN_ERR DEVICE_NAME ": bad access: block=%llu, count=%u\n",
req->sector, req->current_nr_sectors);
end_request(req, 0);
continue;
--- linux-apus/drivers/scsi/NCR53C9x.c.orig 2005-07-31 16:12:37.000000000 -0400
+++ linux-apus/drivers/scsi/NCR53C9x.c 2005-07-31 16:13:38.000000000 -0400
@@ -3648,5 +3648,9 @@ EXPORT_SYMBOL(esp_reset);
EXPORT_SYMBOL(esp_slave_alloc);
EXPORT_SYMBOL(esp_slave_destroy);
EXPORT_SYMBOL(esps_in_use);
+EXPORT_SYMBOL(esps_running);
+EXPORT_SYMBOL(nesps);
+EXPORT_SYMBOL(esp_release);
+EXPORT_SYMBOL(esp_proc_info);
MODULE_LICENSE("GPL");
--- linux-apus/drivers/scsi/wd33c93.c.orig 2005-07-31 14:53:04.000000000 -0400
+++ linux-apus/drivers/scsi/wd33c93.c 2005-07-31 14:53:10.000000000 -0400
@@ -80,6 +80,7 @@
#include <linux/version.h>
#include <linux/init.h>
#include <linux/blkdev.h>
+#include <linux/interrupt.h>
#include <asm/irq.h>
#include <scsi/scsi.h>
--- linux-apus/drivers/net/apne.c.orig 2005-07-31 15:55:07.000000000 -0400
+++ linux-apus/drivers/net/apne.c 2005-07-31 16:22:18.000000000 -0400
@@ -629,7 +629,8 @@ static int init_pcmcia(void)
}
#endif
- out_8(GAYLE_ATTRIBUTE+offset, config);
+ out_8((volatile unsigned char __iomem *)(GAYLE_ATTRIBUTE+offset),
+ config);
return 1;
}
--- linux-apus/drivers/net/8390.h.orig 2005-07-31 15:04:12.000000000 -0400
+++ linux-apus/drivers/net/8390.h 2005-07-31 15:04:08.000000000 -0400
@@ -117,10 +117,10 @@ struct ei_device {
#undef outb
#undef outb_p
-#define inb(port) in_8(port)
-#define outb(val,port) out_8(port,val)
-#define inb_p(port) in_8(port)
-#define outb_p(val,port) out_8(port,val)
+#define inb(port) in_8((volatile unsigned char __iomem *)port)
+#define outb(val,port) out_8((volatile unsigned char __iomem *)port,val)
+#define inb_p(port) in_8((volatile unsigned char __iomem *)port)
+#define outb_p(val,port) out_8((volatile unsigned char __iomem *)port,val)
#elif defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE)
#define EI_SHIFT(x) (ei_local->reg_offset[x])
--- linux-apus/arch/ppc/platforms/apus_setup.c.orig 2005-07-31 16:10:45.000000000 -0400
+++ linux-apus/arch/ppc/platforms/apus_setup.c 2005-07-31 16:15:53.000000000 -0400
@@ -46,6 +46,9 @@ struct mem_info memory[NUM_MEMINFO];/* m
int m68k_realnum_memory = 0;
struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
+EXPORT_SYMBOL(m68k_realnum_memory);
+EXPORT_SYMBOL(m68k_memory);
+
unsigned long ppc_memstart;
unsigned long ppc_pgstart;
unsigned long ppc_memoffset;
@@ -370,6 +373,7 @@ int mm_end_of_chunk (unsigned long addr,
return 1;
return 0;
}
+EXPORT_SYMBOL(mm_end_of_chunk);
/*********************************************************** CACHE */
@@ -392,6 +396,7 @@ void cache_push(u32 paddr, int length)
"sync \n\t"
: : "r" (addr));
}
+EXPORT_SYMBOL(cache_push);
void cache_clear(u32 paddr, int length)
{
@@ -427,6 +432,7 @@ void cache_clear(u32 paddr, int length)
"isync \n\t"
: : "r" (addr));
}
+EXPORT_SYMBOL(cache_clear);
/****************************************************** from setup.c */
void
--- linux-apus/arch/ppc/platforms/apus_pci.c.orig 2005-07-31 15:48:28.000000000 -0400
+++ linux-apus/arch/ppc/platforms/apus_pci.c 2005-07-31 16:22:38.000000000 -0400
@@ -59,7 +59,7 @@ void *pci_io_base(unsigned int bus)
int
-apus_pcibios_read_config(struct pci_bus *bus, int devfn, int offset,
+apus_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
int len, u32 *val)
{
int fnno = FNNO(devfn);
@@ -91,8 +91,8 @@ apus_pcibios_read_config(struct pci_bus
}
int
-apus_pcibios_write_config(struct pci_bus *bus, int devfn, int offset,
- int len, u32 *val)
+apus_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
+ int len, u32 val)
{
int fnno = FNNO(devfn);
int devno = DEVNO(devfn);
--- linux-apus/arch/ppc/mm/pgtable.c.orig 2005-07-31 14:55:59.000000000 -0400
+++ linux-apus/arch/ppc/mm/pgtable.c 2005-07-31 14:57:19.000000000 -0400
@@ -191,7 +191,7 @@ __ioremap(phys_addr_t addr, unsigned lon
* Don't allow anybody to remap normal RAM that we're using.
* mem_init() sets high_memory so only do the check after that.
*/
- if (mem_init_done && (p + size >= virt_to_phys(KERNELBASE)) &&
+ if (mem_init_done && (p + size >= virt_to_phys((void *)KERNELBASE)) &&
(p < virt_to_phys(high_memory))) {
printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
__builtin_return_address(0));
--
John W. Linville
lin...@tu...
|
|
From: John W. L. <lin...@tu...> - 2005-08-01 01:09:57
|
Re-enable CONFIG_APUS in apus_defconfig, and turn-on several other Amiga-related options. Signed-off-by: John W. Linville <lin...@tu...> --- Not sure how/why CONFIG_APUS got turned-off, but I'm pretty sure we need it... :-) I turned-on most other things that I thought were Amiga-related, however it is _extremely_ likely that I either missed something, or I included unnecessary or inappropriate options. Please be sure to review and/or augment the changes below. arch/ppc/configs/apus_defconfig | 456 ++++++---------------------------------- 1 files changed, 70 insertions(+), 386 deletions(-) --- linux-apus/arch/ppc/configs/apus_defconfig.orig 2005-07-31 17:01:25.000000000 -0400 +++ linux-apus/arch/ppc/configs/apus_defconfig 2005-07-31 17:02:52.000000000 -0400 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.12 -# Sun Jul 31 03:17:02 2005 +# Sun Jul 31 17:02:18 2005 # CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y @@ -89,16 +89,14 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_PMAC=y -CONFIG_PPC601_SYNC_FIX=y CONFIG_PM=y CONFIG_PPC_STD_MMU=y # # Platform options # -CONFIG_PPC_MULTIPLATFORM=y -# CONFIG_APUS is not set +# CONFIG_PPC_MULTIPLATFORM is not set +CONFIG_APUS=y # CONFIG_KATANA is not set # CONFIG_WILLOW is not set # CONFIG_CPCI690 is not set @@ -129,21 +127,29 @@ CONFIG_PPC_MULTIPLATFORM=y # CONFIG_PQ2FADS is not set # CONFIG_LITE5200 is not set # CONFIG_MPC834x_SYS is not set -CONFIG_PPC_CHRP=y -CONFIG_PPC_PMAC=y -CONFIG_PPC_PREP=y -CONFIG_PPC_OF=y -CONFIG_PPCBUG_NVRAM=y # CONFIG_SMP is not set # CONFIG_PREEMPT is not set # CONFIG_HIGHMEM is not set CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m -CONFIG_PROC_DEVICETREE=y -CONFIG_PREP_RESIDUAL=y -CONFIG_PROC_PREPRESIDUAL=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0,9600 console=tty0 root=/dev/sda2" +CONFIG_AMIGA=y +CONFIG_ZORRO=y +CONFIG_ABSTRACT_CONSOLE=y +CONFIG_APUS_FAST_EXCEPT=y +CONFIG_AMIGA_PCMCIA=y +CONFIG_AMIGA_BUILTIN_SERIAL=m +CONFIG_GVPIOEXT=m +CONFIG_GVPIOEXT_LP=m +CONFIG_GVPIOEXT_PLIP=m +CONFIG_MULTIFACE_III_TTY=m +CONFIG_A2232=m +CONFIG_WHIPPET_SERIAL=m +CONFIG_APNE=m +# CONFIG_HEARTBEAT is not set +# CONFIG_PROC_HARDWARE is not set +CONFIG_ZORRO_NAMES=y # CONFIG_PM_DEBUG is not set # CONFIG_SOFTWARE_SUSPEND is not set CONFIG_ISA_DMA_API=y @@ -151,12 +157,12 @@ CONFIG_ISA_DMA_API=y # # Bus options # -CONFIG_ISA=y CONFIG_GENERIC_ISA_DMA=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y +CONFIG_PCI_PERMEDIA=y CONFIG_PCI_LEGACY_PROC=y -CONFIG_PCI_NAMES=y +# CONFIG_PCI_NAMES is not set # # PCCARD (PCMCIA/CardBus) support @@ -201,14 +207,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # # Plug and Play support # -# CONFIG_PNP is not set # # Block devices # CONFIG_BLK_DEV_FD=m -# CONFIG_MAC_FLOPPY is not set -# CONFIG_BLK_DEV_XD is not set +CONFIG_AMIGA_FLOPPY=m +CONFIG_AMIGA_Z2RAM=m # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set @@ -218,7 +223,6 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -258,46 +262,13 @@ CONFIG_BLK_DEV_IDESCSI=y # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_SL82C105=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=y -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -CONFIG_BLK_DEV_PDC202XX_NEW=y -# CONFIG_PDC202XX_FORCE is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y -CONFIG_BLK_DEV_IDEDMA_PMAC=y -CONFIG_BLK_DEV_IDE_PMAC_BLINK=y +# CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_IDE_ARM is not set -# CONFIG_IDE_CHIPSETS is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y +CONFIG_BLK_DEV_GAYLE=y +CONFIG_BLK_DEV_IDEDOUBLER=y +CONFIG_BLK_DEV_BUDDHA=y +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # @@ -335,45 +306,29 @@ CONFIG_SCSI_SPI_ATTRS=y # # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set # CONFIG_SCSI_AACRAID is not set -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -CONFIG_AIC7XXX_DEBUG_ENABLE=y -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC7XXX_OLD=m +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DTC3280 is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_NCR53C406A is not set -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PSI240I is not set -# CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_QLA2XXX=y @@ -383,22 +338,19 @@ CONFIG_SCSI_QLA2XXX=y # CONFIG_SCSI_QLA2322 is not set # CONFIG_SCSI_QLA6312 is not set # CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_MESH=y -CONFIG_SCSI_MESH_SYNC_RATE=5 -CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 -CONFIG_SCSI_MAC53C94=y - -# -# Old CD-ROM drivers (not SCSI, not IDE) -# -# CONFIG_CD_NO_IDESCSI is not set +CONFIG_A3000_SCSI=m +CONFIG_A2091_SCSI=m +CONFIG_GVP11_SCSI=m +CONFIG_CYBERSTORM_SCSI=m +CONFIG_CYBERSTORMII_SCSI=m +CONFIG_BLZ2060_SCSI=m +CONFIG_BLZ1230_SCSI=m +CONFIG_FASTLANE_SCSI=m +# CONFIG_OKTAGON_SCSI is not set # # Multi-device support (RAID and LVM) @@ -423,18 +375,6 @@ CONFIG_SCSI_MAC53C94=y # # Macintosh device drivers # -CONFIG_ADB=y -CONFIG_ADB_CUDA=y -CONFIG_ADB_PMU=y -CONFIG_PMAC_PBOOK=y -CONFIG_PMAC_APM_EMU=y -CONFIG_PMAC_BACKLIGHT=y -CONFIG_ADB_MACIO=y -CONFIG_INPUT_ADBHID=y -CONFIG_MAC_EMUMOUSEBTN=y -CONFIG_THERM_WINDTUNNEL=m -CONFIG_THERM_ADT746X=m -# CONFIG_ANSLCD is not set # # Networking support @@ -577,55 +517,20 @@ CONFIG_NETDEVICES=y # CONFIG_NET_ETHERNET=y CONFIG_MII=y -CONFIG_MACE=y -# CONFIG_MACE_AAUI_PORT is not set -CONFIG_BMAC=y +CONFIG_ARIADNE=m +CONFIG_A2065=m +CONFIG_HYDRA=m +CONFIG_ZORRO8390=m # CONFIG_HAPPYMEAL is not set -CONFIG_SUNGEM=y +# CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set # # Tulip family network device support # -CONFIG_NET_TULIP=y -CONFIG_DE2104X=y -CONFIG_TULIP=y -# CONFIG_TULIP_MWI is not set -CONFIG_TULIP_MMIO=y -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -# CONFIG_WINBOND_840 is not set -# CONFIG_DM9102 is not set -# CONFIG_AT1700 is not set -# CONFIG_DEPCA is not set +# CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set -# CONFIG_NET_ISA is not set -CONFIG_NET_PCI=y -CONFIG_PCNET32=y -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_AC3200 is not set -# CONFIG_APRICOT is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_CS89x0 is not set -# CONFIG_DGRS is not set -# CONFIG_EEPRO100 is not set -# CONFIG_E100 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_NET_POCKET is not set +# CONFIG_NET_PCI is not set # # Ethernet (1000 Mbit) @@ -638,10 +543,8 @@ CONFIG_PCNET32=y # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set # CONFIG_SK98LIN is not set -# CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set -# CONFIG_MV643XX_ETH is not set # # Ethernet (10000 Mbit) @@ -663,18 +566,11 @@ CONFIG_NET_RADIO=y # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set -# CONFIG_ARLAN is not set -# CONFIG_WAVELAN is not set # # Wireless 802.11b ISA/PCI cards support # -# CONFIG_AIRO is not set -CONFIG_HERMES=m -CONFIG_APPLE_AIRPORT=m -# CONFIG_PLX_HERMES is not set -# CONFIG_TMD_HERMES is not set -# CONFIG_PCI_HERMES is not set +# CONFIG_HERMES is not set # CONFIG_ATMEL is not set # @@ -738,17 +634,15 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_AMIGA=y CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_INPORT is not set -# CONFIG_MOUSE_LOGIBM is not set -# CONFIG_MOUSE_PC110PAD is not set +CONFIG_MOUSE_AMIGA=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -# CONFIG_INPUT_PCSPKR is not set CONFIG_INPUT_UINPUT=m # @@ -780,9 +674,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4 # # Non-8250 serial port support # -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_PMACZILOG=y -# CONFIG_SERIAL_PMACZILOG_CONSOLE is not set +CONFIG_SERIAL_CORE=m # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -837,13 +729,10 @@ CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_ALI15X3 is not set # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_ELEKTOR is not set -CONFIG_I2C_HYDRA=y # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_ISA is not set -CONFIG_I2C_KEYWEST=m # CONFIG_I2C_MPC is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -939,40 +828,30 @@ CONFIG_FB_MACMODES=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y # CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -CONFIG_FB_OF=y -CONFIG_FB_CONTROL=y -CONFIG_FB_PLATINUM=y -CONFIG_FB_VALKYRIE=y +CONFIG_FB_PM2=y +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=y +CONFIG_FB_AMIGA=y +CONFIG_FB_AMIGA_OCS=y +CONFIG_FB_AMIGA_ECS=y +CONFIG_FB_AMIGA_AGA=y +CONFIG_FB_FM2=y CONFIG_FB_CT65550=y # CONFIG_FB_ASILIANT is not set CONFIG_FB_IMSTT=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set -CONFIG_FB_MATROX=y -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y -# CONFIG_FB_MATROX_G is not set -CONFIG_FB_MATROX_I2C=y -# CONFIG_FB_MATROX_MULTIHEAD is not set +# CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON_OLD is not set -CONFIG_FB_RADEON=y -CONFIG_FB_RADEON_I2C=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=y -CONFIG_FB_ATY=y -CONFIG_FB_ATY_CT=y -# CONFIG_FB_ATY_GENERIC_LCD is not set -# CONFIG_FB_ATY_XL_INIT is not set -CONFIG_FB_ATY_GX=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set -CONFIG_FB_3DFX=y -# CONFIG_FB_3DFX_ACCEL is not set +# CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_S1D13XXX is not set @@ -981,13 +860,13 @@ CONFIG_FB_3DFX=y # # Console display driver support # -CONFIG_VGA_CONSOLE=y -# CONFIG_MDA_CONSOLE is not set +# CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +CONFIG_FONT_PEARL_8x8=y # # Logo configuration @@ -1002,7 +881,7 @@ CONFIG_LOGO_LINUX_CLUT224=y # Sound # CONFIG_SOUND=m -CONFIG_DMASOUND_PMAC=m +CONFIG_DMASOUND_PAULA=m CONFIG_DMASOUND=m # @@ -1011,8 +890,6 @@ CONFIG_DMASOUND=m CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m # CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y @@ -1021,13 +898,10 @@ CONFIG_SND_PCM_OSS=m CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CONFIG_SND_GENERIC_PM=y # # Generic devices # -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m # CONFIG_SND_DUMMY is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set @@ -1035,33 +909,6 @@ CONFIG_SND_OPL3_LIB=m # CONFIG_SND_MPU401 is not set # -# ISA devices -# -CONFIG_SND_CS4231_LIB=m -# CONFIG_SND_AD1848 is not set -# CONFIG_SND_CS4231 is not set -CONFIG_SND_CS4232=m -# CONFIG_SND_CS4236 is not set -# CONFIG_SND_ES1688 is not set -# CONFIG_SND_ES18XX is not set -# CONFIG_SND_GUSCLASSIC is not set -# CONFIG_SND_GUSEXTREME is not set -# CONFIG_SND_GUSMAX is not set -# CONFIG_SND_INTERWAVE is not set -# CONFIG_SND_INTERWAVE_STB is not set -# CONFIG_SND_OPTI92X_AD1848 is not set -# CONFIG_SND_OPTI92X_CS4231 is not set -# CONFIG_SND_OPTI93X is not set -# CONFIG_SND_SB8 is not set -# CONFIG_SND_SB16 is not set -# CONFIG_SND_SBAWE is not set -# CONFIG_SND_WAVEFRONT is not set -# CONFIG_SND_CMI8330 is not set -# CONFIG_SND_OPL3SA2 is not set -# CONFIG_SND_SGALAXY is not set -# CONFIG_SND_SSCAPE is not set - -# # PCI devices # # CONFIG_SND_ALI5451 is not set @@ -1107,13 +954,6 @@ CONFIG_SND_CS4232=m # # ALSA PowerMac devices # -CONFIG_SND_POWERMAC=m - -# -# USB devices -# -CONFIG_SND_USB_AUDIO=m -# CONFIG_SND_USB_USX2Y is not set # # Open Sound System @@ -1125,162 +965,7 @@ CONFIG_SND_USB_AUDIO=m # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_EHCI_HCD is not set -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -# CONFIG_USB_UHCI_HCD is not set -# CONFIG_USB_SL811_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_AUDIO is not set -# CONFIG_USB_BLUETOOTH_TTY is not set -# CONFIG_USB_MIDI is not set -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -CONFIG_USB_STORAGE_FREECOM=y -# CONFIG_USB_STORAGE_ISD200 is not set -CONFIG_USB_STORAGE_DPCM=y -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_MTOUCH is not set -# CONFIG_USB_EGALAX is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_ZD1201 is not set -CONFIG_USB_MON=y - -# -# USB port drivers -# - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -# CONFIG_USB_SERIAL_GENERIC is not set -# CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP2101 is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -CONFIG_USB_SERIAL_VISOR=m -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -CONFIG_USB_SERIAL_KEYSPAN=m -# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OMNINET is not set -CONFIG_USB_EZUSB=y - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_TEST is not set - -# -# USB ATM/DSL drivers -# +# CONFIG_USB is not set # # USB Gadget Support @@ -1475,7 +1160,6 @@ CONFIG_ZLIB_DEFLATE=y # CONFIG_PRINTK_TIME is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BOOTX_TEXT=y # # Security options -- John W. Linville lin...@tu... |
|
From: <A.L...@lb...> - 2005-07-31 09:46:48
|
Hi, there was a recent report that the latest kernels arent compiling on APUS - I havent had time to chase this up - but can anyone give more details? thanks alan |
|
From: Roman Z. <zi...@us...> - 2005-07-31 01:18:46
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/oss/
Changes by: zi...@sc....(none) 05/07/30 18:18:40
Log message:
conflict fixes from import of 2.6.12
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
init.c pgtable.c
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
Added files:
2.6/arch/ppc64/kernel/:
pmc.c
2.6/arch/um/kernel/:
vmlinux.lds.S
2.6/include/asm-ppc64/:
pmc.h
Removed files:
2.6/Documentation/BK-usage/:
00-INDEX bk-kernel-howto.txt bk-make-sum bksend bz64wrap
cpcset cset-to-linus csets-to-patches gcapatch unbz64wrap
2.6/Documentation/DocBook/:
tulip-user.tmpl via-audio.tmpl
2.6/Documentation/cdrom/:
mcd
2.6/Documentation/i2c/:
i2c-parport
2.6/Documentation/networking/:
ethertap.txt
2.6/Documentation/scsi/:
qla2xxx.revision.notes
2.6/arch/arm/configs/:
a5k_defconfig
2.6/arch/arm/mach-ixp4xx/:
prpmc1100-pci.c prpmc1100-setup.c
2.6/arch/arm/mm/:
copypage-v4mc.S copypage-xscale.S minicache.c
2.6/arch/ia64/sn/include/pci/:
pcibus_provider_defs.h pcidev.h
2.6/arch/m68knommu/platform/5206/ARNEWSH/:
crt0_ram.S
2.6/arch/m68knommu/platform/5206e/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5206e/eLITE/:
crt0_ram.S
2.6/arch/m68knommu/platform/5249/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/CANCam/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/NETtel/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/SCALES/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/senTec/:
crt0_ram.S
2.6/arch/m68knommu/platform/527x/M5271EVB/:
crt0_ram.S
2.6/arch/m68knommu/platform/527x/M5275EVB/:
crt0_ram.S
2.6/arch/m68knommu/platform/528x/M5282EVB/:
crt0_ram.S
2.6/arch/m68knommu/platform/528x/senTec/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/ARNEWSH/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/CLEOPATRA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/MP3/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/NETtel/:
crt0_ram.S
2.6/arch/m68knommu/platform/5407/CLEOPATRA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5407/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/68328/pilot/:
crt0_rom.S
2.6/arch/m68knommu/platform/68360/uCquicc/:
crt0_ram.S crt0_rom.S
2.6/arch/m68knommu/platform/68EZ328/ucsimm/:
crt0_fixed.S crt0_himem.S crt0_ram.S crt0_rom.S
2.6/arch/m68knommu/platform/68VZ328/de2/:
Makefile crt0_ram.S
2.6/arch/m68knommu/platform/68VZ328/ucdimm/:
Makefile crt0_fixed.S crt0_himem.S crt0_ram.S crt0_rom.S
2.6/arch/mips/vr41xx/common/:
ksyms.c rtc.c serial.c vrc4171.c
2.6/arch/mips/vr41xx/tanbac-tb0229/:
tb0219.c
2.6/arch/parisc/configs/:
n4000_defconfig
2.6/arch/ppc/boot/simple/:
misc-chestnut.S misc-ev64260.S misc-mv64x60.S
mv64x60_stub.c
2.6/arch/ppc/kernel/:
head_e500.S
2.6/arch/ppc/platforms/85xx/:
mpc85xx_devices.c mpc85xx_sys.c
2.6/arch/ppc/syslib/:
m8260_pci.c m8260_pci.h ppc4xx_serial.c
2.6/arch/ppc64/boot/:
no_initrd.c start.c
2.6/arch/sh/:
defconfig
2.6/arch/sh64/:
defconfig
2.6/arch/sh64/lib/:
old-checksum.c
2.6/arch/sparc64/lib/:
VIS.h VISbzero.S VIScsum.S VIScsumcopy.S VIScsumcopyusr.S
VISmemset.S rwsem.c
2.6/arch/um/drivers/:
slip_proto.h
2.6/arch/um/include/:
2_5compat.h
2.6/arch/um/kernel/:
checksum.c initrd_kern.c initrd_user.c sys_call_table.c
2.6/arch/um/sys-i386/util/:
mk_thread_kern.c mk_thread_user.c
2.6/arch/um/sys-x86_64/util/:
mk_thread_kern.c mk_thread_user.c
2.6/arch/um/util/:
mk_constants_kern.c mk_constants_user.c mk_task_kern.c
mk_task_user.c
2.6/arch/x86_64/kernel/:
vsyscall.S
2.6/drivers/base/:
interface.c
2.6/drivers/block/paride/:
setup.h
2.6/drivers/cdrom/:
mcd.c mcd.h
2.6/drivers/char/:
console_macros.h digi_bios.h digi_fep.h fep.h
hp600_keyb.c pcxx.c pcxx.h tpqic02.c
2.6/drivers/char/agp/:
intel-mch-agp.c
2.6/drivers/cpufreq/:
proc_intf.c
2.6/drivers/ide/:
ide-default.c
2.6/drivers/isdn/tpam/:
Kconfig Makefile tpam.h tpam_commands.c tpam_crcpc.c
tpam_hdlc.c tpam_main.c tpam_memory.c tpam_nco.c
tpam_queues.c
2.6/drivers/media/dvb/b2c2/:
b2c2-common.c b2c2-usb-core.c
2.6/drivers/media/dvb/bt8xx/:
dst.h
2.6/drivers/media/dvb/dibusb/:
dvb-dibusb-pid.c
2.6/drivers/media/video/:
tuner.c
2.6/drivers/mtd/maps/:
chestnut.c ich2rom.c
2.6/drivers/net/:
bagetlance.c ethertap.c
2.6/drivers/net/fc/:
Makefile iph5526.c iph5526_ip.h iph5526_novram.c
iph5526_scsi.h tach.h tach_structs.h
2.6/drivers/scsi/:
qlogicfc.h qlogicisp.h scsi_obsolete.h
2.6/drivers/scsi/qla2xxx/:
qla_listops.h
2.6/drivers/scsi/sym53c8xx_2/:
sym_conf.h sym_misc.c
2.6/drivers/usb/image/:
hpusbscsi.c hpusbscsi.h
2.6/drivers/video/intelfb/:
intelfbdrv.h
2.6/drivers/video/savage/:
savagefb.c
2.6/include/asm-arm/arch-omap/:
clocks.h
2.6/include/asm-ia64/:
ioctl32.h
2.6/include/asm-ia64/sn/:
fetchop.h sn_fru.h sndrv.h
2.6/include/asm-m68knommu/:
io_hw_swap.h semp3.h
2.6/include/asm-mips/vr41xx/:
vrc4171.h
2.6/include/asm-parisc/:
parport_gsc.h
2.6/include/asm-ppc64/iSeries/:
iSeries_fixup.h
2.6/include/asm-um/:
arch-signal-i386.h elf.h
2.6/include/asm-x86_64/:
ioctl32.h ipc.h
2.6/include/linux/:
compiler-gcc+.h dp83840.h iso_fs_i.h iso_fs_sb.h
tpqic02.h
2.6/include/sound/:
yss225.h
2.6/net/ipv4/ipvs/:
ip_vs_proto_icmp.c
2.6/net/ipv6/:
README
2.6/net/netlink/:
netlink_dev.c
2.6/scripts/:
makeman split-man
2.6/sound/core/ioctl32/:
Makefile hwdep32.c ioctl32.c ioctl32.h pcm32.c
rawmidi32.c seq32.c timer32.c
2.6/sound/isa/gus/:
gus_lfo.c
2.6/sound/oss/:
maestro_tables.h
Revision Changes Path
1.15 +39 -20 2.6/Makefile
1.7 +17 -17 2.6/arch/ppc/Makefile
1.12 +736 -312 2.6/arch/ppc/configs/apus_defconfig
1.10 +3 -1 2.6/arch/ppc/kernel/Makefile
1.9 +105 -97 2.6/arch/ppc/kernel/entry.S
1.10 +113 -276 2.6/arch/ppc/kernel/head.S
1.12 +13 -22 2.6/arch/ppc/kernel/misc.S
1.12 +2 -1 2.6/arch/ppc/kernel/ppc_ksyms.c
1.11 +37 -22 2.6/arch/ppc/kernel/setup.c
1.8 +0 -3 2.6/arch/ppc/kernel/time.c
1.8 +25 -12 2.6/arch/ppc/mm/init.c
1.11 +7 -17 2.6/arch/ppc/mm/pgtable.c
1.12 +13 -0 2.6/include/asm-ppc/io.h
1.8 +9 -0 2.6/include/asm-ppc/machdep.h
1.9 +116 -58 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2005-07-31 00:31:57
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 05/07/30 17:31:47 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10918 Log Message: import native 2.6.12 Status: Vendor Tag: linux Release Tags: linux-2_6_12 C 2.6/Makefile N 2.6/Documentation/SecurityBugs N 2.6/Documentation/cpusets.txt N 2.6/Documentation/dontdiff N 2.6/Documentation/kref.txt N 2.6/Documentation/DocBook/stylesheet.xsl N 2.6/Documentation/arm/Samsung-S3C24XX/H1940.txt N 2.6/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt N 2.6/Documentation/cpu-freq/cpufreq-stats.txt N 2.6/Documentation/i2c/busses/i2c-ali1535 N 2.6/Documentation/i2c/busses/i2c-ali1563 N 2.6/Documentation/i2c/busses/i2c-ali15x3 N 2.6/Documentation/i2c/busses/i2c-amd756 N 2.6/Documentation/i2c/busses/i2c-amd8111 N 2.6/Documentation/i2c/busses/i2c-i801 N 2.6/Documentation/i2c/busses/i2c-i810 N 2.6/Documentation/i2c/busses/i2c-nforce2 N 2.6/Documentation/i2c/busses/i2c-parport N 2.6/Documentation/i2c/busses/i2c-parport-light N 2.6/Documentation/i2c/busses/i2c-pca-isa N 2.6/Documentation/i2c/busses/i2c-piix4 N 2.6/Documentation/i2c/busses/i2c-prosavage N 2.6/Documentation/i2c/busses/i2c-savage4 N 2.6/Documentation/i2c/busses/i2c-sis5595 N 2.6/Documentation/i2c/busses/i2c-sis630 N 2.6/Documentation/i2c/busses/i2c-sis69x N 2.6/Documentation/i2c/busses/i2c-via N 2.6/Documentation/i2c/busses/i2c-viapro N 2.6/Documentation/i2c/busses/i2c-voodoo3 N 2.6/Documentation/i2c/busses/scx200_acb N 2.6/Documentation/aoe/todo.txt N 2.6/Documentation/aoe/udev-install.sh N 2.6/Documentation/aoe/udev.txt N 2.6/Documentation/scsi/lpfc.txt N 2.6/Documentation/scsi/ChangeLog.lpfc N 2.6/Documentation/sound/alsa/VIA82xx-mixer.txt N 2.6/Documentation/sound/alsa/hda_codec.txt N 2.6/Documentation/usb/usbmon.txt N 2.6/Documentation/dvb/README.flexcop N 2.6/Documentation/dvb/ci.txt N 2.6/arch/arm/common/Kconfig N 2.6/arch/arm/common/sharpsl_param.c N 2.6/arch/arm/lib/bitops.h N 2.6/arch/arm/mach-pxa/poodle.c N 2.6/arch/arm/mm/copypage-v4mc.c N 2.6/arch/arm/mm/copypage-xscale.c N 2.6/arch/arm/mm/abort-macro.S N 2.6/arch/arm/configs/pxa255-idp_defconfig N 2.6/arch/arm/mach-omap/board-netstar.c N 2.6/arch/arm/mach-omap/board-voiceblue.c N 2.6/arch/arm/mach-omap/leds-osk.c N 2.6/arch/arm/mach-s3c2410/mach-n30.c N 2.6/arch/arm/mach-s3c2410/mach-nexcoder.c N 2.6/arch/arm/mach-s3c2410/mach-otom.c N 2.6/arch/arm/mach-s3c2410/mach-smdk2440.c N 2.6/arch/i386/kernel/reboot_fixups.c N 2.6/arch/i386/kernel/syscall_table.S N 2.6/arch/i386/kernel/vsyscall-note.S N 2.6/arch/i386/kernel/cpu/cpufreq/sc520_freq.c N 2.6/arch/i386/lib/putuser.S N 2.6/arch/ia64/sn/pci/tioca_provider.c N 2.6/arch/ia64/sn/kernel/tiocx.c N 2.6/arch/ia64/sn/kernel/xp_main.c N 2.6/arch/ia64/sn/kernel/xp_nofault.S N 2.6/arch/ia64/sn/kernel/xpc.h N 2.6/arch/ia64/sn/kernel/xpc_channel.c N 2.6/arch/ia64/sn/kernel/xpc_main.c N 2.6/arch/ia64/sn/kernel/xpc_partition.c N 2.6/arch/ia64/sn/kernel/xpnet.c N 2.6/arch/m68knommu/platform/68328/head-pilot.S N 2.6/arch/m68knommu/platform/68328/head-ram.S N 2.6/arch/m68knommu/platform/68328/head-rom.S N 2.6/arch/sh64/kernel/module.c N 2.6/arch/sh64/lib/iomap.c N 2.6/arch/sh64/mach-cayman/iomap.c C 2.6/arch/ppc/Makefile N 2.6/arch/ppc/boot/simple/misc-ev64260.c N 2.6/arch/ppc/boot/simple/misc-chestnut.c N 2.6/arch/ppc/boot/simple/misc-mv64x60.c N 2.6/arch/ppc/boot/simple/openbios.c N 2.6/arch/ppc/boot/simple/misc-radstone_ppc7d.c N 2.6/arch/ppc/configs/hdpu_defconfig N 2.6/arch/ppc/configs/mpc834x_sys_defconfig N 2.6/arch/ppc/configs/radstone_ppc7d_defconfig C 2.6/arch/ppc/kernel/Makefile C 2.6/arch/ppc/kernel/entry.S C 2.6/arch/ppc/kernel/head.S C 2.6/arch/ppc/kernel/misc.S C 2.6/arch/ppc/kernel/ppc_ksyms.c C 2.6/arch/ppc/kernel/setup.c C 2.6/arch/ppc/kernel/time.c N 2.6/arch/ppc/kernel/swsusp.S N 2.6/arch/ppc/kernel/fpu.S N 2.6/arch/ppc/kernel/head_fsl_booke.S C 2.6/arch/ppc/mm/init.c C 2.6/arch/ppc/mm/pgtable.c N 2.6/arch/ppc/platforms/hdpu.c N 2.6/arch/ppc/platforms/hdpu.h N 2.6/arch/ppc/platforms/chrp_pegasos_eth.c N 2.6/arch/ppc/platforms/radstone_ppc7d.c N 2.6/arch/ppc/platforms/radstone_ppc7d.h N 2.6/arch/ppc/platforms/83xx/Makefile N 2.6/arch/ppc/platforms/83xx/mpc834x_sys.c N 2.6/arch/ppc/platforms/83xx/mpc834x_sys.h N 2.6/arch/ppc/syslib/ipic.c N 2.6/arch/ppc/syslib/ipic.h N 2.6/arch/ppc/syslib/m82xx_pci.c N 2.6/arch/ppc/syslib/m82xx_pci.h N 2.6/arch/ppc/syslib/ppc83xx_setup.c N 2.6/arch/ppc/syslib/mpc52xx_devices.c N 2.6/arch/ppc/syslib/mpc52xx_pci.c N 2.6/arch/ppc/syslib/mpc52xx_pci.h N 2.6/arch/ppc/syslib/mpc52xx_sys.c N 2.6/arch/ppc/syslib/mpc83xx_devices.c N 2.6/arch/ppc/syslib/mpc83xx_sys.c N 2.6/arch/ppc/syslib/mpc85xx_devices.c N 2.6/arch/ppc/syslib/mpc85xx_sys.c N 2.6/arch/ppc/syslib/ppc83xx_setup.h C 2.6/arch/ppc64/kernel/pmc.c N 2.6/arch/ppc64/kernel/pSeries_reconfig.c N 2.6/arch/ppc64/kernel/vdso.c N 2.6/arch/ppc64/kernel/vdso32/Makefile N 2.6/arch/ppc64/kernel/vdso32/cacheflush.S N 2.6/arch/ppc64/kernel/vdso32/datapage.S N 2.6/arch/ppc64/kernel/vdso32/gettimeofday.S N 2.6/arch/ppc64/kernel/vdso32/note.S N 2.6/arch/ppc64/kernel/vdso32/sigtramp.S N 2.6/arch/ppc64/kernel/vdso32/vdso32.lds.S N 2.6/arch/ppc64/kernel/vdso32/vdso32_wrapper.S N 2.6/arch/ppc64/kernel/vdso64/Makefile N 2.6/arch/ppc64/kernel/vdso64/cacheflush.S N 2.6/arch/ppc64/kernel/vdso64/datapage.S N 2.6/arch/ppc64/kernel/vdso64/gettimeofday.S N 2.6/arch/ppc64/kernel/vdso64/note.S N 2.6/arch/ppc64/kernel/vdso64/sigtramp.S N 2.6/arch/ppc64/kernel/vdso64/vdso64.lds.S N 2.6/arch/ppc64/kernel/vdso64/vdso64_wrapper.S N 2.6/arch/sh/boards/hp6xx/hp620/setup.c N 2.6/arch/sh/configs/se7750_defconfig N 2.6/arch/sparc64/lib/bzero.S N 2.6/arch/sparc64/lib/csum_copy.S N 2.6/arch/sparc64/lib/csum_copy_from_user.S N 2.6/arch/sparc64/lib/csum_copy_to_user.S N 2.6/arch/sparc64/lib/rwsem.S N 2.6/arch/um/drivers/random.c N 2.6/arch/um/drivers/slip_common.c N 2.6/arch/um/drivers/slip_common.h N 2.6/arch/um/include/common-offsets.h N 2.6/arch/um/include/sysdep-i386/faultinfo.h N 2.6/arch/um/include/sysdep-i386/skas_ptrace.h N 2.6/arch/um/include/sysdep-ia64/skas_ptrace.h N 2.6/arch/um/include/sysdep-ppc/skas_ptrace.h N 2.6/arch/um/include/sysdep-x86_64/faultinfo.h N 2.6/arch/um/include/sysdep-x86_64/skas_ptrace.h N 2.6/arch/um/kernel/initrd.c C 2.6/arch/um/kernel/vmlinux.lds.S N 2.6/arch/um/os-Linux/util/Makefile N 2.6/arch/um/os-Linux/util/mk_user_constants.c N 2.6/arch/um/sys-i386/kernel-offsets.c N 2.6/arch/um/sys-i386/sys_call_table.S N 2.6/arch/um/sys-i386/user-offsets.c N 2.6/arch/um/sys-i386/util/mk_thread.c N 2.6/arch/um/util/mk_task.c N 2.6/arch/um/util/mk_constants.c N 2.6/arch/um/scripts/Makefile.rules N 2.6/arch/um/sys-x86_64/kernel-offsets.c N 2.6/arch/um/sys-x86_64/ksyms.c N 2.6/arch/um/sys-x86_64/syscall_table.c N 2.6/arch/um/sys-x86_64/um_module.c N 2.6/arch/um/sys-x86_64/user-offsets.c N 2.6/arch/um/sys-x86_64/util/mk_thread.c N 2.6/arch/x86_64/kernel/pmtimer.c N 2.6/arch/frv/Kconfig.debug N 2.6/crypto/tgr192.c N 2.6/drivers/acpi/acpi_memhotplug.c N 2.6/drivers/char/tb0219.c N 2.6/drivers/char/vr41xx_rtc.c N 2.6/drivers/char/mbcs.c N 2.6/drivers/char/mbcs.h N 2.6/drivers/char/snsc_event.c N 2.6/drivers/char/agp/sgi-agp.c N 2.6/drivers/char/tpm/Kconfig N 2.6/drivers/char/tpm/Makefile N 2.6/drivers/char/tpm/tpm.c N 2.6/drivers/char/tpm/tpm.h N 2.6/drivers/char/tpm/tpm_atmel.c N 2.6/drivers/char/tpm/tpm_nsc.c N 2.6/drivers/cpufreq/cpufreq_conservative.c N 2.6/drivers/i2c/busses/i2c-mv64xxx.c N 2.6/drivers/i2c/chips/ds1337.c N 2.6/drivers/i2c/chips/fscpos.c N 2.6/drivers/i2c/chips/gl520sm.c N 2.6/drivers/i2c/chips/lm92.c N 2.6/drivers/i2c/chips/m41t00.c N 2.6/drivers/i2c/chips/sis5595.c N 2.6/drivers/input/keyboard/corgikbd.c N 2.6/drivers/input/keyboard/hil_kbd.c N 2.6/drivers/input/keyboard/hilkbd.c N 2.6/drivers/input/keyboard/locomokbd.c N 2.6/drivers/input/misc/hp_sdc_rtc.c N 2.6/drivers/input/mouse/hil_ptr.c N 2.6/drivers/input/serio/hil_mlc.c N 2.6/drivers/input/serio/hp_sdc.c N 2.6/drivers/input/serio/hp_sdc_mlc.c N 2.6/drivers/input/touchscreen/corgi_ts.c N 2.6/drivers/input/touchscreen/elo.c N 2.6/drivers/input/touchscreen/hp680_ts_input.c N 2.6/drivers/input/touchscreen/mk712.c N 2.6/drivers/input/touchscreen/mtouch.c N 2.6/drivers/isdn/hisax/hfc4s8s_l1.c N 2.6/drivers/isdn/hisax/hfc4s8s_l1.h N 2.6/drivers/isdn/hisax/hfc_usb.h N 2.6/drivers/macintosh/smu.c N 2.6/drivers/md/dm-bio-record.h N 2.6/drivers/md/dm-emc.c N 2.6/drivers/md/dm-hw-handler.c N 2.6/drivers/md/dm-hw-handler.h N 2.6/drivers/md/dm-mpath.c N 2.6/drivers/md/dm-mpath.h N 2.6/drivers/md/dm-path-selector.c N 2.6/drivers/md/dm-path-selector.h N 2.6/drivers/md/dm-round-robin.c N 2.6/drivers/media/dvb/frontends/dvb-pll.c N 2.6/drivers/media/dvb/frontends/dvb-pll.h N 2.6/drivers/media/dvb/frontends/or51132.c N 2.6/drivers/media/dvb/frontends/or51132.h N 2.6/drivers/media/dvb/frontends/or51211.c N 2.6/drivers/media/dvb/frontends/or51211.h N 2.6/drivers/media/dvb/b2c2/flexcop-common.h N 2.6/drivers/media/dvb/b2c2/flexcop-dma.c N 2.6/drivers/media/dvb/b2c2/flexcop-eeprom.c N 2.6/drivers/media/dvb/b2c2/flexcop-fe-tuner.c N 2.6/drivers/media/dvb/b2c2/flexcop-hw-filter.c N 2.6/drivers/media/dvb/b2c2/flexcop-i2c.c N 2.6/drivers/media/dvb/b2c2/flexcop-misc.c N 2.6/drivers/media/dvb/b2c2/flexcop-pci.c N 2.6/drivers/media/dvb/b2c2/flexcop-reg.h N 2.6/drivers/media/dvb/b2c2/flexcop-sram.c N 2.6/drivers/media/dvb/b2c2/flexcop-usb.c N 2.6/drivers/media/dvb/b2c2/flexcop-usb.h N 2.6/drivers/media/dvb/b2c2/flexcop.c N 2.6/drivers/media/dvb/b2c2/flexcop.h N 2.6/drivers/media/dvb/bt8xx/dst_ca.c N 2.6/drivers/media/dvb/bt8xx/dst_ca.h N 2.6/drivers/media/dvb/bt8xx/dst_common.h N 2.6/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c N 2.6/drivers/media/video/mt20xx.c N 2.6/drivers/media/video/tda8290.c N 2.6/drivers/media/video/tuner-core.c N 2.6/drivers/media/video/tuner-simple.c N 2.6/drivers/media/video/cx88/cx88-input.c N 2.6/drivers/misc/hdpuftrs/Makefile N 2.6/drivers/misc/hdpuftrs/hdpu_cpustate.c N 2.6/drivers/misc/hdpuftrs/hdpu_nexus.c N 2.6/drivers/net/bnx2.c N 2.6/drivers/net/bnx2.h N 2.6/drivers/net/bnx2_fw.h N 2.6/drivers/net/wireless/atmel.h N 2.6/drivers/parisc/pdc_stable.c N 2.6/drivers/parport/parport_gsc.h N 2.6/drivers/s390/net/claw.c N 2.6/drivers/s390/net/claw.h N 2.6/drivers/s390/net/ctcmain.h N 2.6/drivers/s390/net/qeth_eddp.c N 2.6/drivers/s390/net/qeth_eddp.h N 2.6/drivers/s390/net/qeth_tso.h N 2.6/drivers/scsi/lpfc/Makefile N 2.6/drivers/scsi/lpfc/lpfc.h N 2.6/drivers/scsi/lpfc/lpfc_attr.c N 2.6/drivers/scsi/lpfc/lpfc_compat.h N 2.6/drivers/scsi/lpfc/lpfc_crtn.h N 2.6/drivers/scsi/lpfc/lpfc_ct.c N 2.6/drivers/scsi/lpfc/lpfc_disc.h N 2.6/drivers/scsi/lpfc/lpfc_els.c N 2.6/drivers/scsi/lpfc/lpfc_hbadisc.c N 2.6/drivers/scsi/lpfc/lpfc_hw.h N 2.6/drivers/scsi/lpfc/lpfc_init.c N 2.6/drivers/scsi/lpfc/lpfc_logmsg.h N 2.6/drivers/scsi/lpfc/lpfc_mbox.c N 2.6/drivers/scsi/lpfc/lpfc_mem.c N 2.6/drivers/scsi/lpfc/lpfc_nportdisc.c N 2.6/drivers/scsi/lpfc/lpfc_scsi.c N 2.6/drivers/scsi/lpfc/lpfc_scsi.h N 2.6/drivers/scsi/lpfc/lpfc_sli.c N 2.6/drivers/scsi/lpfc/lpfc_sli.h N 2.6/drivers/scsi/lpfc/lpfc_version.h N 2.6/drivers/scsi/qla2xxx/qla_attr.c N 2.6/drivers/serial/ioc4_serial.c N 2.6/drivers/serial/vr41xx_siu.c N 2.6/drivers/serial/jsm/Makefile N 2.6/drivers/serial/jsm/jsm.h N 2.6/drivers/serial/jsm/jsm_driver.c N 2.6/drivers/serial/jsm/jsm_neo.c N 2.6/drivers/serial/jsm/jsm_tty.c N 2.6/drivers/usb/host/ohci-ppc-soc.c N 2.6/drivers/usb/host/sl811_cs.c N 2.6/drivers/usb/host/uhci-q.c N 2.6/drivers/usb/media/pwc/Makefile N 2.6/drivers/usb/media/pwc/philips.txt N 2.6/drivers/usb/media/pwc/pwc-ctrl.c N 2.6/drivers/usb/media/pwc/pwc-if.c N 2.6/drivers/usb/media/pwc/pwc-ioctl.h N 2.6/drivers/usb/media/pwc/pwc-kiara.c N 2.6/drivers/usb/media/pwc/pwc-kiara.h N 2.6/drivers/usb/media/pwc/pwc-misc.c N 2.6/drivers/usb/media/pwc/pwc-nala.h N 2.6/drivers/usb/media/pwc/pwc-timon.c N 2.6/drivers/usb/media/pwc/pwc-timon.h N 2.6/drivers/usb/media/pwc/pwc-uncompress.c N 2.6/drivers/usb/media/pwc/pwc-uncompress.h N 2.6/drivers/usb/media/pwc/pwc.h N 2.6/drivers/usb/misc/sisusbvga/Kconfig N 2.6/drivers/usb/misc/sisusbvga/Makefile N 2.6/drivers/usb/misc/sisusbvga/sisusb.c N 2.6/drivers/usb/misc/sisusbvga/sisusb.h N 2.6/drivers/usb/net/zd1201.c N 2.6/drivers/usb/net/zd1201.h N 2.6/drivers/usb/serial/airprime.c N 2.6/drivers/usb/serial/cp2101.c N 2.6/drivers/usb/serial/hp4x.c N 2.6/drivers/usb/serial/option.c N 2.6/drivers/usb/mon/Kconfig N 2.6/drivers/usb/mon/Makefile N 2.6/drivers/usb/mon/mon_main.c N 2.6/drivers/usb/mon/mon_stat.c N 2.6/drivers/usb/mon/mon_text.c N 2.6/drivers/usb/mon/usb_mon.h N 2.6/drivers/video/imxfb.c N 2.6/drivers/video/imxfb.h N 2.6/drivers/video/s1d13xxxfb.c N 2.6/drivers/video/savage/savagefb_driver.c N 2.6/drivers/video/geode/Kconfig N 2.6/drivers/video/geode/Makefile N 2.6/drivers/video/geode/display_gx1.c N 2.6/drivers/video/geode/display_gx1.h N 2.6/drivers/video/geode/geodefb.h N 2.6/drivers/video/geode/gx1fb_core.c N 2.6/drivers/video/geode/video_cs5530.c N 2.6/drivers/video/geode/video_cs5530.h N 2.6/drivers/video/nvidia/Makefile N 2.6/drivers/video/nvidia/nv_accel.c N 2.6/drivers/video/nvidia/nv_dma.h N 2.6/drivers/video/nvidia/nv_hw.c N 2.6/drivers/video/nvidia/nv_i2c.c N 2.6/drivers/video/nvidia/nv_local.h N 2.6/drivers/video/nvidia/nv_of.c N 2.6/drivers/video/nvidia/nv_proto.h N 2.6/drivers/video/nvidia/nv_setup.c N 2.6/drivers/video/nvidia/nv_type.h N 2.6/drivers/video/nvidia/nvidia.c N 2.6/drivers/infiniband/hw/mthca/mthca_uar.c N 2.6/drivers/sh/Makefile N 2.6/drivers/sh/superhyway/Makefile N 2.6/drivers/sh/superhyway/superhyway-sysfs.c N 2.6/drivers/sh/superhyway/superhyway.c N 2.6/drivers/sn/Makefile N 2.6/drivers/sn/ioc4.c N 2.6/fs/cifs/cifsencrypt.h N 2.6/fs/cifs/ioctl.c N 2.6/fs/fat/fatent.c N 2.6/fs/isofs/isofs.h N 2.6/fs/xfs/linux-2.6/xfs_export.h N 2.6/include/asm-arm/arch-pxa/poodle.h N 2.6/include/asm-arm/mach/sharpsl_param.h N 2.6/include/asm-arm/arch-imx/imxfb.h N 2.6/include/asm-arm/arch-omap/aic23.h N 2.6/include/asm-arm/arch-omap/board-netstar.h N 2.6/include/asm-arm/arch-omap/board-voiceblue.h N 2.6/include/asm-arm/arch-s3c2410/otom-map.h N 2.6/include/asm-arm/arch-s3c2410/regs-adc.h N 2.6/include/asm-generic/ipc.h N 2.6/include/asm-generic/signal.h N 2.6/include/asm-i386/seccomp.h N 2.6/include/asm-ia64/sn/xp.h N 2.6/include/asm-ia64/sn/tioca.h N 2.6/include/asm-ia64/sn/tiocx.h N 2.6/include/asm-ia64/sn/pcibus_provider_defs.h N 2.6/include/asm-ia64/sn/pcidev.h N 2.6/include/asm-ia64/sn/tioca_provider.h N 2.6/include/asm-mips/vr41xx/pci.h N 2.6/include/asm-mips/vr41xx/siu.h C 2.6/include/asm-ppc/io.h C 2.6/include/asm-ppc/machdep.h C 2.6/include/asm-ppc/pgtable.h N 2.6/include/asm-ppc/ipic.h N 2.6/include/asm-ppc/mpc83xx.h N 2.6/include/asm-ppc/suspend.h N 2.6/include/asm-ppc64/agp.h N 2.6/include/asm-ppc64/imalloc.h N 2.6/include/asm-ppc64/pSeries_reconfig.h C 2.6/include/asm-ppc64/pmc.h N 2.6/include/asm-ppc64/seccomp.h N 2.6/include/asm-ppc64/smu.h N 2.6/include/asm-ppc64/vdso.h N 2.6/include/asm-sh/cpu-sh3/timer.h N 2.6/include/asm-sh/cpu-sh4/timer.h N 2.6/include/asm-sh/sh03/ide.h N 2.6/include/asm-sparc64/rwsem-const.h N 2.6/include/asm-um/elf-i386.h N 2.6/include/asm-um/elf-ppc.h N 2.6/include/asm-um/elf-x86_64.h N 2.6/include/asm-x86_64/seccomp.h N 2.6/include/linux/ip_mp_alg.h N 2.6/include/linux/cpuset.h N 2.6/include/linux/patchkey.h N 2.6/include/linux/cryptohash.h N 2.6/include/linux/seccomp.h N 2.6/include/linux/compiler-gcc4.h N 2.6/include/linux/usb_cdc.h N 2.6/include/linux/hdpu_features.h N 2.6/include/linux/ioc4_common.h N 2.6/include/linux/reboot_fixups.h N 2.6/include/linux/sort.h N 2.6/include/linux/superhyway.h N 2.6/include/linux/tc_act/tc_defact.h N 2.6/include/linux/tc_ematch/tc_em_cmp.h N 2.6/include/linux/tc_ematch/tc_em_meta.h N 2.6/include/linux/tc_ematch/tc_em_nbyte.h N 2.6/include/net/act_generic.h N 2.6/include/net/ip_mp_alg.h N 2.6/include/net/tc_act/tc_defact.h N 2.6/include/sound/ak4114.h N 2.6/include/video/s1d13xxxfb.h N 2.6/kernel/cpuset.c N 2.6/kernel/posix-cpu-timers.c N 2.6/kernel/seccomp.c N 2.6/lib/halfmd4.c N 2.6/lib/sha1.c N 2.6/lib/sort.c N 2.6/net/ipv4/multipath.c N 2.6/net/ipv4/multipath_drr.c N 2.6/net/ipv4/multipath_random.c N 2.6/net/ipv4/multipath_rr.c N 2.6/net/ipv4/multipath_wrandom.c N 2.6/net/sched/cls_basic.c N 2.6/net/sched/em_cmp.c N 2.6/net/sched/em_meta.c N 2.6/net/sched/em_nbyte.c N 2.6/net/sched/em_u32.c N 2.6/net/sched/ematch.c N 2.6/net/sched/simple.c N 2.6/scripts/show_delta N 2.6/scripts/kconfig/POTFILES.in N 2.6/scripts/kconfig/kxgettext.c N 2.6/sound/core/control_compat.c N 2.6/sound/core/hwdep_compat.c N 2.6/sound/core/pcm_compat.c N 2.6/sound/core/rawmidi_compat.c N 2.6/sound/core/timer_compat.c N 2.6/sound/core/seq/seq_compat.c N 2.6/sound/i2c/other/ak4114.c N 2.6/sound/parisc/harmony.h N 2.6/sound/pci/emu10k1/p16v.c N 2.6/sound/pci/emu10k1/p16v.h N 2.6/sound/pci/ice1712/juli.c N 2.6/sound/pci/ice1712/juli.h N 2.6/sound/pci/ice1712/phase.c N 2.6/sound/pci/ice1712/phase.h N 2.6/sound/pci/hda/Makefile N 2.6/sound/pci/hda/hda_codec.c N 2.6/sound/pci/hda/hda_codec.h N 2.6/sound/pci/hda/hda_generic.c N 2.6/sound/pci/hda/hda_intel.c N 2.6/sound/pci/hda/hda_local.h N 2.6/sound/pci/hda/hda_patch.h N 2.6/sound/pci/hda/hda_proc.c N 2.6/sound/pci/hda/patch_analog.c N 2.6/sound/pci/hda/patch_cmedia.c N 2.6/sound/pci/hda/patch_realtek.c N 2.6/sound/ppc/toonie.c 17 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Roman Z. <zi...@us...> - 2005-07-30 23:07:26
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/oss/
Changes by: zi...@sc....(none) 05/07/30 16:07:20
Log message:
conflict fixes from import of 2.6.11
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
init.c pgtable.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-ppc/:
io.h pgtable.h
Removed files:
2.6/Documentation/:
README.moxa mkdev.cciss
2.6/Documentation/filesystems/:
umsdos.txt
2.6/Documentation/i2c/:
i2c-old-porting
2.6/Documentation/scsi/:
ChangeLog
2.6/Documentation/usb/:
silverlink.txt
2.6/arch/arm26/boot/compressed/:
ofw-shark.c
2.6/arch/arm26/kernel/:
time-acorn.c
2.6/arch/arm26/lib/:
io-readsl-armv3.S io-readsw-armv3.S io-writesw-armv3.S
2.6/arch/arm26/machine/:
head.S oldlatches.c small_page.c
2.6/arch/arm26/mm/:
mm-memc.c
2.6/arch/ia64/dig/:
topology.c
2.6/arch/ia64/sn/include/:
shub.h shubio.h
2.6/arch/m68k/apollo/:
dn_debug.c
2.6/arch/m68k/sun3x/:
sun3x_ksyms.c
2.6/arch/mips/kernel/:
irix5sys.h reg.c
2.6/arch/mips/mm/:
tlb64-glue-r4k.S tlb64-glue-sb1.S tlbex32-mips32.S
tlbex32-r3k.S tlbex32-r4k.S
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/boot/simple/:
gt64260_tty.c
2.6/arch/ppc/oprofile/:
init.c
2.6/arch/ppc/platforms/:
ev64260_setup.c
2.6/arch/ppc/platforms/85xx/:
mpc8540.c mpc8555.c mpc8560.c
2.6/arch/ppc/syslib/:
gt64260_common.c
2.6/arch/ppc64/kernel/:
pci_dma_direct.c
2.6/arch/ppc64/xmon/:
setjmp.c
2.6/arch/s390/kernel/:
compat_exec.c
2.6/arch/um/:
Kconfig_block
2.6/arch/um/include/:
frame.h frame_user.h umn.h
2.6/arch/um/include/sysdep-i386/:
frame.h frame_kern.h frame_user.h
2.6/arch/um/kernel/:
frame.c frame_kern.c
2.6/arch/um/kernel/skas/include/:
ptrace-skas.h
2.6/arch/um/kernel/skas/sys-i386/:
Makefile sigcontext.c
2.6/arch/um/kernel/skas/util/:
mk_ptregs.c
2.6/arch/um/kernel/tt/include/:
ptrace-tt.h
2.6/arch/um/kernel/tt/sys-i386/:
Makefile sigcontext.c
2.6/arch/x86_64/kernel/:
warmreboot.S
2.6/arch/x86_64/lib/:
old-checksum.c
2.6/drivers/acpi/:
processor.c
2.6/drivers/atm/:
nicstarmac.h
2.6/drivers/char/:
README.cycladesZ rsf16fmi.h serial_tx3912.c
serial_tx3912.h sonypi.h
2.6/drivers/char/drm/:
ati_pcigart.h drm_agpsupport.h drm_auth.h drm_bufs.h
drm_context.h drm_dma.h drm_drawable.h drm_drv.h
drm_fops.h drm_init.h drm_ioctl.h drm_irq.h drm_lock.h
drm_proc.h drm_scatter.h drm_stub.h drm_vm.h ffb.h
gamma.h i810.h i830.h i915.h mga.h r128.h radeon.h sis.h
tdfx.h
2.6/drivers/char/ip2/:
Makefile ip2mkdev.c ip2stat.c ip2trace.c
2.6/drivers/char/rio/:
cdproto.h
2.6/drivers/ide/pci/:
adma100.c adma100.h aec62xx.h cmd64x.h cy82c693.h
generic.h hpt366.h it8172.h opti621.h pdc202xx_new.h
pdc202xx_old.h piix.h serverworks.h
2.6/drivers/media/dvb/dibusb/:
dvb-dibusb.c
2.6/drivers/mtd/devices/:
doc1000.c
2.6/drivers/net/:
net_init.c
2.6/drivers/pcmcia/:
bulkmem.c
2.6/drivers/scsi/:
fd_mcs.h lasi700.h scsi_syms.c
2.6/drivers/scsi/dpt/:
dpt_osdutil.h
2.6/drivers/scsi/qla2xxx/:
ql6322.c ql6322_fw.c
2.6/drivers/usb/misc/:
tiglusb.c tiglusb.h
2.6/fs/fat/:
fatfs_syms.c
2.6/fs/jfs/:
jfs_defragfs.h
2.6/fs/smbfs/:
ChangeLog
2.6/fs/umsdos/:
Makefile README-WIP.txt dir.c emd.c inode.c ioctl.c
mangle.c namei.c rdir.c specs
2.6/include/asm-arm26/:
calls.h ian_char.h
2.6/include/asm-ia64/sn/:
router.h
2.6/include/asm-m68k/:
adb_mouse.h atari_SCCserial.h
2.6/include/asm-m68knommu/:
keyboard.h nap.h
2.6/include/asm-mips/:
ng1.h ng1hw.h
2.6/include/asm-mips/it8172/:
it8172_lpc.h
2.6/include/asm-parisc/:
bootdata.h
2.6/include/asm-ppc64/iSeries/:
ItLpPaca.h iSeries_VpdInfo.h
2.6/include/linux/:
affs_fs_i.h affs_fs_sb.h blk.h msdos_fs_i.h msdos_fs_sb.h
umsdos_fs.h umsdos_fs.p umsdos_fs_i.h
2.6/include/linux/netfilter_ipv4/:
compat_firewall.h ipchains_core.h ipfwadm_core.h
2.6/include/sound/:
soundmem.h
2.6/net/ipv4/netfilter/:
ip_fw_compat.c ip_fw_compat.h ip_fw_compat_masq.c
ip_fw_compat_redir.c ipchains_core.c ipfwadm_core.c
2.6/net/sunrpc/:
svcauth_des.c
2.6/net/sunrpc/auth_gss/:
gss_pseudoflavors.c sunrpcgss_syms.c
2.6/net/xfrm/:
xfrm_export.c
2.6/scripts/:
README.Menuconfig
2.6/sound/core/seq/oss/:
seq_oss_misc.c
2.6/sound/oss/:
cs4232.h
Revision Changes Path
1.14 +20 -12 2.6/Makefile
1.6 +4 -1 2.6/arch/ppc/Makefile
1.11 +79 -15 2.6/arch/ppc/configs/apus_defconfig
1.9 +2 -1 2.6/arch/ppc/kernel/Makefile
1.8 +18 -24 2.6/arch/ppc/kernel/entry.S
1.11 +1 -1 2.6/arch/ppc/kernel/misc.S
1.11 +1 -0 2.6/arch/ppc/kernel/ppc_ksyms.c
1.10 +1 -1 2.6/arch/ppc/kernel/setup.c
1.7 +2 -8 2.6/arch/ppc/kernel/time.c
1.7 +1 -1 2.6/arch/ppc/mm/init.c
1.10 +6 -6 2.6/arch/ppc/mm/pgtable.c
1.5 +1 -1 2.6/drivers/block/amiflop.c
1.11 +30 -11 2.6/include/asm-ppc/io.h
1.8 +20 -3 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2005-07-30 22:25:17
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 05/07/30 15:25:09 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21629 Log Message: import native 2.6.11 Status: Vendor Tag: linux Release Tags: linux-2_6_11 C 2.6/Makefile N 2.6/Documentation/atomic_ops.txt N 2.6/Documentation/nommu-mmap.txt N 2.6/Documentation/PCIEBUS-HOWTO.txt N 2.6/Documentation/README.cycladesZ N 2.6/Documentation/feature-removal-schedule.txt N 2.6/Documentation/sparse.txt N 2.6/Documentation/filesystems/sysfs-pci.txt N 2.6/Documentation/i2c/chips/smsc47b397.txt N 2.6/Documentation/aoe/aoe.txt N 2.6/Documentation/aoe/autoload.sh N 2.6/Documentation/aoe/mkdevs.sh N 2.6/Documentation/aoe/mkshelf.sh N 2.6/Documentation/aoe/status.sh N 2.6/Documentation/powerpc/cpu_features.txt N 2.6/Documentation/powerpc/eeh-pci-error-recovery.txt N 2.6/Documentation/scsi/ChangeLog.1992-1997 N 2.6/Documentation/sound/alsa/Bt87x.txt N 2.6/Documentation/w1/w1.generic N 2.6/Documentation/fujitsu/frv/README.txt N 2.6/Documentation/fujitsu/frv/atomic-ops.txt N 2.6/Documentation/fujitsu/frv/booting.txt N 2.6/Documentation/fujitsu/frv/clock.txt N 2.6/Documentation/fujitsu/frv/configuring.txt N 2.6/Documentation/fujitsu/frv/features.txt N 2.6/Documentation/fujitsu/frv/gdbinit N 2.6/Documentation/fujitsu/frv/gdbstub.txt N 2.6/Documentation/fujitsu/frv/mmu-layout.txt N 2.6/Documentation/infiniband/ipoib.txt N 2.6/Documentation/infiniband/sysfs.txt N 2.6/Documentation/infiniband/user_mad.txt N 2.6/arch/arm/boot/compressed/head-sharpsl.S N 2.6/arch/arm/common/scoop.c N 2.6/arch/arm/kernel/smp.c N 2.6/arch/arm/mach-iop3xx/iq80332-mm.c N 2.6/arch/arm/mach-iop3xx/iq80332-pci.c N 2.6/arch/arm/mach-pxa/corgi.c N 2.6/arch/arm/mach-pxa/corgi_ssp.c N 2.6/arch/arm/configs/iq80332_defconfig N 2.6/arch/arm/configs/omap_h2_1610_defconfig N 2.6/arch/arm/mach-ixp4xx/gtwx5715-pci.c N 2.6/arch/arm/mach-ixp4xx/gtwx5715-setup.c N 2.6/arch/arm26/kernel/calls.S N 2.6/arch/arm26/kernel/head.S N 2.6/arch/arm26/lib/io-writesw.S N 2.6/arch/arm26/lib/io-readsl.S N 2.6/arch/arm26/lib/io-readsw.S N 2.6/arch/arm26/machine/latches.c N 2.6/arch/arm26/mm/memc.c N 2.6/arch/arm26/mm/small_page.c N 2.6/arch/i386/kernel/cpu/cpufreq/speedstep-est-common.h N 2.6/arch/i386/oprofile/backtrace.c N 2.6/arch/ia64/hp/common/hwsw_iommu.c N 2.6/arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c N 2.6/arch/ia64/kernel/topology.c N 2.6/arch/ia64/oprofile/backtrace.c N 2.6/arch/m68knommu/platform/5307/head.S N 2.6/arch/mips/kernel/irq-rm9000.c N 2.6/arch/mips/kernel/irix5sys.S N 2.6/arch/mips/kernel/signal-common.h N 2.6/arch/mips/oprofile/Kconfig N 2.6/arch/mips/oprofile/Makefile N 2.6/arch/mips/oprofile/common.c N 2.6/arch/mips/oprofile/op_impl.h N 2.6/arch/mips/oprofile/op_model_rm9000.c N 2.6/arch/mips/lib/iomap.c N 2.6/arch/mips/mm/tlbex-fault.S N 2.6/arch/mips/mm/dma-ip32.c N 2.6/arch/mips/pci/fixup-sb1250.c N 2.6/arch/mips/pci/fixup-vr4133.c N 2.6/arch/mips/sgi-ip27/ip27-dbgio.c N 2.6/arch/mips/sgi-ip32/ip32-memory.c N 2.6/arch/mips/vr41xx/nec-cmbvr4133/Makefile N 2.6/arch/mips/vr41xx/nec-cmbvr4133/init.c N 2.6/arch/mips/vr41xx/nec-cmbvr4133/irq.c N 2.6/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c N 2.6/arch/mips/vr41xx/nec-cmbvr4133/setup.c N 2.6/arch/parisc/lib/iomap.c C 2.6/arch/ppc/Makefile N 2.6/arch/ppc/boot/include/mpsc_defs.h N 2.6/arch/ppc/boot/simple/misc-chestnut.S N 2.6/arch/ppc/boot/simple/misc-cpci690.c N 2.6/arch/ppc/boot/simple/misc-katana.c N 2.6/arch/ppc/boot/simple/misc-mv64x60.S N 2.6/arch/ppc/boot/simple/mv64x60_stub.c N 2.6/arch/ppc/boot/simple/mv64x60_tty.c C 2.6/arch/ppc/configs/apus_defconfig N 2.6/arch/ppc/configs/chestnut_defconfig N 2.6/arch/ppc/configs/cpci690_defconfig N 2.6/arch/ppc/configs/katana_defconfig N 2.6/arch/ppc/configs/luan_defconfig N 2.6/arch/ppc/configs/mpc8540_ads_defconfig N 2.6/arch/ppc/configs/mpc8555_cds_defconfig N 2.6/arch/ppc/configs/mpc8560_ads_defconfig N 2.6/arch/ppc/configs/stx_gp3_defconfig C 2.6/arch/ppc/kernel/Makefile C 2.6/arch/ppc/kernel/entry.S C 2.6/arch/ppc/kernel/misc.S C 2.6/arch/ppc/kernel/ppc_ksyms.c C 2.6/arch/ppc/kernel/setup.c C 2.6/arch/ppc/kernel/time.c N 2.6/arch/ppc/kernel/perfmon.c N 2.6/arch/ppc/kernel/perfmon_fsl_booke.c C 2.6/arch/ppc/mm/init.c C 2.6/arch/ppc/mm/pgtable.c C 2.6/arch/ppc/platforms/apus_setup.c N 2.6/arch/ppc/platforms/chestnut.c N 2.6/arch/ppc/platforms/katana.c N 2.6/arch/ppc/platforms/katana.h N 2.6/arch/ppc/platforms/chestnut.h N 2.6/arch/ppc/platforms/cpci690.c N 2.6/arch/ppc/platforms/cpci690.h N 2.6/arch/ppc/platforms/ev64260.c N 2.6/arch/ppc/platforms/pmac_cache.S N 2.6/arch/ppc/platforms/4xx/luan.c N 2.6/arch/ppc/platforms/4xx/ibm440sp.c N 2.6/arch/ppc/platforms/4xx/ibm440sp.h N 2.6/arch/ppc/platforms/4xx/luan.h N 2.6/arch/ppc/platforms/85xx/mpc85xx_devices.c N 2.6/arch/ppc/platforms/85xx/stx_gp3.c N 2.6/arch/ppc/platforms/85xx/mpc85xx_sys.c N 2.6/arch/ppc/platforms/85xx/stx_gp3.h N 2.6/arch/ppc/syslib/mv64x60.c N 2.6/arch/ppc/syslib/mv64360_pic.c N 2.6/arch/ppc/syslib/ibm440sp_common.c N 2.6/arch/ppc/syslib/ibm440sp_common.h N 2.6/arch/ppc/syslib/mv64x60_dbg.c N 2.6/arch/ppc/syslib/mv64x60_win.c N 2.6/arch/ppc/syslib/ppc403_pic.c N 2.6/arch/ppc/syslib/ppc_sys.c N 2.6/arch/ppc/oprofile/common.c N 2.6/arch/ppc/oprofile/op_impl.h N 2.6/arch/ppc/oprofile/op_model_fsl_booke.c N 2.6/arch/ppc64/kernel/kprobes.c N 2.6/arch/ppc64/kernel/pci_direct_iommu.c N 2.6/arch/ppc64/xmon/setjmp.S N 2.6/arch/sparc64/prom/cif.S N 2.6/arch/um/Kconfig_i386 N 2.6/arch/um/Kconfig_x86_64 N 2.6/arch/um/drivers/stderr_console.c N 2.6/arch/um/include/elf_user.h N 2.6/arch/um/include/registers.h N 2.6/arch/um/include/sysdep-i386/signal.h N 2.6/arch/um/include/sysdep-x86_64/checksum.h N 2.6/arch/um/include/sysdep-x86_64/ptrace.h N 2.6/arch/um/include/sysdep-x86_64/ptrace_user.h N 2.6/arch/um/include/sysdep-x86_64/sigcontext.h N 2.6/arch/um/include/sysdep-x86_64/signal.h N 2.6/arch/um/include/sysdep-x86_64/syscalls.h N 2.6/arch/um/kernel/skas/util/mk_ptregs-i386.c N 2.6/arch/um/kernel/skas/util/mk_ptregs-x86_64.c N 2.6/arch/um/os-Linux/elf_aux.c N 2.6/arch/um/os-Linux/signal.c N 2.6/arch/um/os-Linux/sys-i386/Makefile N 2.6/arch/um/os-Linux/sys-i386/registers.c N 2.6/arch/um/os-Linux/sys-x86_64/Makefile N 2.6/arch/um/os-Linux/sys-x86_64/registers.c N 2.6/arch/um/sys-i386/delay.c N 2.6/arch/um/sys-i386/signal.c N 2.6/arch/um/sys-x86_64/Makefile N 2.6/arch/um/sys-x86_64/bugs.c N 2.6/arch/um/sys-x86_64/delay.c N 2.6/arch/um/sys-x86_64/fault.c N 2.6/arch/um/sys-x86_64/mem.c N 2.6/arch/um/sys-x86_64/ptrace.c N 2.6/arch/um/sys-x86_64/ptrace_user.c N 2.6/arch/um/sys-x86_64/sigcontext.c N 2.6/arch/um/sys-x86_64/signal.c N 2.6/arch/um/sys-x86_64/syscalls.c N 2.6/arch/um/sys-x86_64/sysrq.c N 2.6/arch/um/sys-x86_64/util/Makefile N 2.6/arch/um/sys-x86_64/util/mk_sc.c N 2.6/arch/um/sys-x86_64/util/mk_thread_kern.c N 2.6/arch/um/sys-x86_64/util/mk_thread_user.c N 2.6/arch/x86_64/kernel/mce_intel.c N 2.6/arch/x86_64/mm/srat.c N 2.6/arch/frv/Kconfig N 2.6/arch/frv/Makefile N 2.6/arch/frv/boot/Makefile N 2.6/arch/frv/kernel/Makefile N 2.6/arch/frv/kernel/break.S N 2.6/arch/frv/kernel/cmode.S N 2.6/arch/frv/kernel/debug-stub.c N 2.6/arch/frv/kernel/dma.c N 2.6/arch/frv/kernel/entry-table.S N 2.6/arch/frv/kernel/entry.S N 2.6/arch/frv/kernel/frv_ksyms.c N 2.6/arch/frv/kernel/gdb-io.c N 2.6/arch/frv/kernel/gdb-io.h N 2.6/arch/frv/kernel/gdb-stub.c N 2.6/arch/frv/kernel/head-mmu-fr451.S N 2.6/arch/frv/kernel/head-uc-fr401.S N 2.6/arch/frv/kernel/head-uc-fr451.S N 2.6/arch/frv/kernel/head-uc-fr555.S N 2.6/arch/frv/kernel/head.S N 2.6/arch/frv/kernel/head.inc N 2.6/arch/frv/kernel/init_task.c N 2.6/arch/frv/kernel/irq-mb93091.c N 2.6/arch/frv/kernel/irq-mb93093.c N 2.6/arch/frv/kernel/irq-mb93493.c N 2.6/arch/frv/kernel/irq-routing.c N 2.6/arch/frv/kernel/irq.c N 2.6/arch/frv/kernel/kernel_thread.S N 2.6/arch/frv/kernel/local.h N 2.6/arch/frv/kernel/pm-mb93093.c N 2.6/arch/frv/kernel/pm.c N 2.6/arch/frv/kernel/process.c N 2.6/arch/frv/kernel/ptrace.c N 2.6/arch/frv/kernel/semaphore.c N 2.6/arch/frv/kernel/setup.c N 2.6/arch/frv/kernel/signal.c N 2.6/arch/frv/kernel/sleep.S N 2.6/arch/frv/kernel/switch_to.S N 2.6/arch/frv/kernel/sys_frv.c N 2.6/arch/frv/kernel/sysctl.c N 2.6/arch/frv/kernel/time.c N 2.6/arch/frv/kernel/traps.c N 2.6/arch/frv/kernel/uaccess.c N 2.6/arch/frv/kernel/vmlinux.lds.S N 2.6/arch/frv/lib/Makefile N 2.6/arch/frv/lib/__ashldi3.S N 2.6/arch/frv/lib/__ashrdi3.S N 2.6/arch/frv/lib/__lshrdi3.S N 2.6/arch/frv/lib/__muldi3.S N 2.6/arch/frv/lib/__negdi2.S N 2.6/arch/frv/lib/atomic-ops.S N 2.6/arch/frv/lib/cache.S N 2.6/arch/frv/lib/checksum.c N 2.6/arch/frv/lib/insl_ns.S N 2.6/arch/frv/lib/insl_sw.S N 2.6/arch/frv/lib/memcpy.S N 2.6/arch/frv/lib/memset.S N 2.6/arch/frv/lib/outsl_ns.S N 2.6/arch/frv/lib/outsl_sw.S N 2.6/arch/frv/mb93090-mb00/Makefile N 2.6/arch/frv/mb93090-mb00/pci-dma-nommu.c N 2.6/arch/frv/mb93090-mb00/pci-dma.c N 2.6/arch/frv/mb93090-mb00/pci-frv.c N 2.6/arch/frv/mb93090-mb00/pci-frv.h N 2.6/arch/frv/mb93090-mb00/pci-irq.c N 2.6/arch/frv/mb93090-mb00/pci-vdk.c N 2.6/arch/frv/mm/Makefile N 2.6/arch/frv/mm/cache-page.c N 2.6/arch/frv/mm/dma-alloc.c N 2.6/arch/frv/mm/elf-fdpic.c N 2.6/arch/frv/mm/extable.c N 2.6/arch/frv/mm/fault.c N 2.6/arch/frv/mm/highmem.c N 2.6/arch/frv/mm/init.c N 2.6/arch/frv/mm/kmap.c N 2.6/arch/frv/mm/mmu-context.c N 2.6/arch/frv/mm/pgalloc.c N 2.6/arch/frv/mm/tlb-flush.S N 2.6/arch/frv/mm/tlb-miss.S N 2.6/arch/frv/mm/unaligned.c N 2.6/drivers/acpi/container.c N 2.6/drivers/acpi/processor_core.c N 2.6/drivers/acpi/processor_idle.c N 2.6/drivers/acpi/processor_perflib.c N 2.6/drivers/acpi/processor_thermal.c N 2.6/drivers/acpi/processor_throttling.c N 2.6/drivers/base/attribute_container.c N 2.6/drivers/base/transport_class.c C 2.6/drivers/block/amiflop.c N 2.6/drivers/block/aoe/Makefile N 2.6/drivers/block/aoe/aoe.h N 2.6/drivers/block/aoe/aoeblk.c N 2.6/drivers/block/aoe/aoechr.c N 2.6/drivers/block/aoe/aoecmd.c N 2.6/drivers/block/aoe/aoedev.c N 2.6/drivers/block/aoe/aoemain.c N 2.6/drivers/block/aoe/aoenet.c N 2.6/drivers/bluetooth/bpa10x.c N 2.6/drivers/char/drm/drm_bufs.c N 2.6/drivers/char/drm/drm_dma.c N 2.6/drivers/char/drm/drm_drawable.c N 2.6/drivers/char/drm/drm_drv.c N 2.6/drivers/char/drm/drm_fops.c N 2.6/drivers/char/drm/drm_init.c N 2.6/drivers/char/drm/drm_ioctl.c N 2.6/drivers/char/drm/drm_irq.c N 2.6/drivers/char/drm/drm_lock.c N 2.6/drivers/char/drm/drm_memory.c N 2.6/drivers/char/drm/drm_stub.c N 2.6/drivers/char/drm/drm_sysfs.c N 2.6/drivers/char/drm/drm_auth.c N 2.6/drivers/char/drm/drm_context.c N 2.6/drivers/char/drm/drm_vm.c N 2.6/drivers/char/drm/drm_agpsupport.c N 2.6/drivers/char/drm/tdfx_drv.h N 2.6/drivers/char/drm/drm_pci.c N 2.6/drivers/char/drm/ati_pcigart.c N 2.6/drivers/char/drm/drm_proc.c N 2.6/drivers/char/drm/drm_scatter.c N 2.6/drivers/cpufreq/cpufreq_stats.c N 2.6/drivers/i2c/busses/i2c-au1550.c N 2.6/drivers/i2c/busses/i2c-au1550.h N 2.6/drivers/i2c/busses/i2c-sibyte.c N 2.6/drivers/i2c/chips/smsc47b397.c N 2.6/drivers/i2c/algos/i2c-algo-sgi.c N 2.6/drivers/i2c/algos/i2c-algo-sibyte.c N 2.6/drivers/input/mouse/alps.c N 2.6/drivers/input/mouse/alps.h N 2.6/drivers/input/serio/libps2.c N 2.6/drivers/input/serio/i8042-x86ia64io.h N 2.6/drivers/md/raid6altivec.uc N 2.6/drivers/media/dvb/frontends/nxt2002.c N 2.6/drivers/media/dvb/frontends/nxt2002.h N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-core.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-pid.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-remote.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb-usb.c N 2.6/drivers/media/video/tveeprom.c N 2.6/drivers/mtd/devices/block2mtd.c N 2.6/drivers/mtd/maps/chestnut.c N 2.6/drivers/mtd/maps/sharpsl-flash.c N 2.6/drivers/mtd/maps/walnut.c N 2.6/drivers/mtd/nand/nandsim.c N 2.6/drivers/mtd/nand/sharpsl.c N 2.6/drivers/net/arcnet/capmode.c N 2.6/drivers/net/sk98lin/skethtool.c N 2.6/drivers/pci/pcie/Kconfig N 2.6/drivers/pci/pcie/Makefile N 2.6/drivers/pci/pcie/portdrv.h N 2.6/drivers/pci/pcie/portdrv_bus.c N 2.6/drivers/pci/pcie/portdrv_core.c N 2.6/drivers/pci/pcie/portdrv_pci.c N 2.6/drivers/pcmcia/au1000_db1x00.c N 2.6/drivers/pcmcia/au1000_generic.h N 2.6/drivers/pcmcia/au1000_xxs1500.c N 2.6/drivers/pcmcia/pxa2xx_sharpsl.c N 2.6/drivers/pcmcia/rsrc_nonstatic.c N 2.6/drivers/pcmcia/vrc4171_card.c N 2.6/drivers/pcmcia/vrc4173_cardu.c N 2.6/drivers/pcmcia/vrc4173_cardu.h N 2.6/drivers/s390/char/sclp_quiesce.c N 2.6/drivers/scsi/sata_qstor.c N 2.6/drivers/scsi/gdth_kcompat.h N 2.6/drivers/scsi/scsi_transport_iscsi.c N 2.6/drivers/serial/mpsc.c N 2.6/drivers/serial/mpsc.h N 2.6/drivers/serial/serial_txx9.c N 2.6/drivers/usb/host/ohci-au1xxx.c N 2.6/drivers/usb/media/sn9c102_hv7131d.c N 2.6/drivers/usb/media/sn9c102_mi0343.c N 2.6/drivers/usb/misc/idmouse.c N 2.6/drivers/usb/serial/garmin_gps.c N 2.6/drivers/usb/serial/ti_fw_3410.h N 2.6/drivers/usb/serial/ti_fw_5052.h N 2.6/drivers/usb/serial/ti_usb_3410_5052.c N 2.6/drivers/usb/serial/ti_usb_3410_5052.h N 2.6/drivers/video/au1100fb.c N 2.6/drivers/video/au1100fb.h N 2.6/drivers/video/bt431.h N 2.6/drivers/video/bt455.h N 2.6/drivers/video/pmag-aa-fb.c N 2.6/drivers/video/w100fb.c N 2.6/drivers/video/w100fb.h N 2.6/drivers/video/backlight/Kconfig N 2.6/drivers/video/backlight/Makefile N 2.6/drivers/video/backlight/backlight.c N 2.6/drivers/video/backlight/corgi_bl.c N 2.6/drivers/video/backlight/lcd.c N 2.6/drivers/crypto/Kconfig N 2.6/drivers/crypto/Makefile N 2.6/drivers/crypto/padlock-aes.c N 2.6/drivers/crypto/padlock-generic.c N 2.6/drivers/crypto/padlock.h N 2.6/drivers/infiniband/Kconfig N 2.6/drivers/infiniband/Makefile N 2.6/drivers/infiniband/core/Makefile N 2.6/drivers/infiniband/core/agent.c N 2.6/drivers/infiniband/core/agent.h N 2.6/drivers/infiniband/core/agent_priv.h N 2.6/drivers/infiniband/core/cache.c N 2.6/drivers/infiniband/core/core_priv.h N 2.6/drivers/infiniband/core/device.c N 2.6/drivers/infiniband/core/fmr_pool.c N 2.6/drivers/infiniband/core/mad.c N 2.6/drivers/infiniband/core/mad_priv.h N 2.6/drivers/infiniband/core/packer.c N 2.6/drivers/infiniband/core/sa_query.c N 2.6/drivers/infiniband/core/smi.c N 2.6/drivers/infiniband/core/smi.h N 2.6/drivers/infiniband/core/sysfs.c N 2.6/drivers/infiniband/core/ud_header.c N 2.6/drivers/infiniband/core/user_mad.c N 2.6/drivers/infiniband/core/verbs.c N 2.6/drivers/infiniband/hw/mthca/Kconfig N 2.6/drivers/infiniband/hw/mthca/Makefile N 2.6/drivers/infiniband/hw/mthca/mthca_allocator.c N 2.6/drivers/infiniband/hw/mthca/mthca_av.c N 2.6/drivers/infiniband/hw/mthca/mthca_cmd.c N 2.6/drivers/infiniband/hw/mthca/mthca_cmd.h N 2.6/drivers/infiniband/hw/mthca/mthca_config_reg.h N 2.6/drivers/infiniband/hw/mthca/mthca_cq.c N 2.6/drivers/infiniband/hw/mthca/mthca_dev.h N 2.6/drivers/infiniband/hw/mthca/mthca_doorbell.h N 2.6/drivers/infiniband/hw/mthca/mthca_eq.c N 2.6/drivers/infiniband/hw/mthca/mthca_mad.c N 2.6/drivers/infiniband/hw/mthca/mthca_main.c N 2.6/drivers/infiniband/hw/mthca/mthca_mcg.c N 2.6/drivers/infiniband/hw/mthca/mthca_memfree.c N 2.6/drivers/infiniband/hw/mthca/mthca_memfree.h N 2.6/drivers/infiniband/hw/mthca/mthca_mr.c N 2.6/drivers/infiniband/hw/mthca/mthca_pd.c N 2.6/drivers/infiniband/hw/mthca/mthca_profile.c N 2.6/drivers/infiniband/hw/mthca/mthca_profile.h N 2.6/drivers/infiniband/hw/mthca/mthca_provider.c N 2.6/drivers/infiniband/hw/mthca/mthca_provider.h N 2.6/drivers/infiniband/hw/mthca/mthca_qp.c N 2.6/drivers/infiniband/hw/mthca/mthca_reset.c N 2.6/drivers/infiniband/include/ib_cache.h N 2.6/drivers/infiniband/include/ib_fmr_pool.h N 2.6/drivers/infiniband/include/ib_mad.h N 2.6/drivers/infiniband/include/ib_pack.h N 2.6/drivers/infiniband/include/ib_sa.h N 2.6/drivers/infiniband/include/ib_smi.h N 2.6/drivers/infiniband/include/ib_user_mad.h N 2.6/drivers/infiniband/include/ib_verbs.h N 2.6/drivers/infiniband/ulp/ipoib/Kconfig N 2.6/drivers/infiniband/ulp/ipoib/Makefile N 2.6/drivers/infiniband/ulp/ipoib/ipoib.h N 2.6/drivers/infiniband/ulp/ipoib/ipoib_fs.c N 2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c N 2.6/drivers/infiniband/ulp/ipoib/ipoib_main.c N 2.6/drivers/infiniband/ulp/ipoib/ipoib_multicast.c N 2.6/drivers/infiniband/ulp/ipoib/ipoib_verbs.c N 2.6/drivers/infiniband/ulp/ipoib/ipoib_vlan.c N 2.6/fs/binfmt_elf_fdpic.c N 2.6/fs/affs/affs.h N 2.6/fs/nfsd/nfs4callback.c N 2.6/fs/proc/internal.h N 2.6/fs/proc/mmu.c N 2.6/fs/proc/nommu.c N 2.6/fs/xfs/Kconfig N 2.6/fs/xfs/linux-2.6/xfs_export.c N 2.6/fs/debugfs/Makefile N 2.6/fs/debugfs/file.c N 2.6/fs/debugfs/inode.c N 2.6/include/acpi/container.h N 2.6/include/asm-alpha/cputime.h N 2.6/include/asm-arm/cpu.h N 2.6/include/asm-arm/cputime.h N 2.6/include/asm-arm/arch-cl7500/debug-macro.S N 2.6/include/asm-arm/arch-cl7500/entry-macro.S N 2.6/include/asm-arm/arch-clps711x/debug-macro.S N 2.6/include/asm-arm/arch-clps711x/entry-macro.S N 2.6/include/asm-arm/arch-ebsa110/debug-macro.S N 2.6/include/asm-arm/arch-ebsa110/entry-macro.S N 2.6/include/asm-arm/arch-ebsa285/debug-macro.S N 2.6/include/asm-arm/arch-ebsa285/entry-macro.S N 2.6/include/asm-arm/arch-epxa10db/debug-macro.S N 2.6/include/asm-arm/arch-epxa10db/entry-macro.S N 2.6/include/asm-arm/arch-integrator/debug-macro.S N 2.6/include/asm-arm/arch-integrator/entry-macro.S N 2.6/include/asm-arm/arch-iop3xx/debug-macro.S N 2.6/include/asm-arm/arch-iop3xx/entry-macro.S N 2.6/include/asm-arm/arch-iop3xx/iq80332.h N 2.6/include/asm-arm/arch-l7200/debug-macro.S N 2.6/include/asm-arm/arch-l7200/entry-macro.S N 2.6/include/asm-arm/arch-pxa/audio.h N 2.6/include/asm-arm/arch-pxa/corgi.h N 2.6/include/asm-arm/arch-pxa/debug-macro.S N 2.6/include/asm-arm/arch-pxa/entry-macro.S N 2.6/include/asm-arm/arch-rpc/debug-macro.S N 2.6/include/asm-arm/arch-rpc/entry-macro.S N 2.6/include/asm-arm/arch-sa1100/debug-macro.S N 2.6/include/asm-arm/arch-sa1100/entry-macro.S N 2.6/include/asm-arm/arch-shark/debug-macro.S N 2.6/include/asm-arm/arch-shark/entry-macro.S N 2.6/include/asm-arm/hardware/entry-macro-iomd.S N 2.6/include/asm-arm/hardware/scoop.h N 2.6/include/asm-arm/arch-imx/debug-macro.S N 2.6/include/asm-arm/arch-imx/entry-macro.S N 2.6/include/asm-arm/arch-lh7a40x/debug-macro.S N 2.6/include/asm-arm/arch-lh7a40x/entry-macro.S N 2.6/include/asm-arm/arch-omap/debug-macro.S N 2.6/include/asm-arm/arch-omap/entry-macro.S N 2.6/include/asm-arm/arch-s3c2410/debug-macro.S N 2.6/include/asm-arm/arch-s3c2410/entry-macro.S N 2.6/include/asm-arm/arch-versatile/debug-macro.S N 2.6/include/asm-arm/arch-versatile/entry-macro.S N 2.6/include/asm-arm/arch-ixp4xx/debug-macro.S N 2.6/include/asm-arm/arch-ixp4xx/entry-macro.S N 2.6/include/asm-arm/arch-ixp4xx/gtwx5715.h N 2.6/include/asm-arm/arch-h720x/debug-macro.S N 2.6/include/asm-arm/arch-h720x/entry-macro.S N 2.6/include/asm-arm/arch-ixp2000/debug-macro.S N 2.6/include/asm-arm/arch-ixp2000/entry-macro.S N 2.6/include/asm-arm26/cputime.h N 2.6/include/asm-arm26/dma-mapping.h N 2.6/include/asm-cris/cputime.h N 2.6/include/asm-generic/4level-fixup.h N 2.6/include/asm-generic/cputime.h N 2.6/include/asm-generic/pgtable-nopmd.h N 2.6/include/asm-generic/pgtable-nopud.h N 2.6/include/asm-generic/resource.h N 2.6/include/asm-generic/termios.h N 2.6/include/asm-h8300/cputime.h N 2.6/include/asm-i386/cputime.h N 2.6/include/asm-ia64/cputime.h N 2.6/include/asm-ia64/machvec_hpzx1_swiotlb.h N 2.6/include/asm-ia64/sn/shubio.h N 2.6/include/asm-m68k/cputime.h N 2.6/include/asm-m68knommu/cputime.h N 2.6/include/asm-m68knommu/mcfcache.h N 2.6/include/asm-mips/m48t37.h N 2.6/include/asm-mips/reg.h N 2.6/include/asm-mips/cputime.h N 2.6/include/asm-mips/vr41xx/cmbvr4133.h N 2.6/include/asm-mips/mach-ip32/cpu-feature-overrides.h N 2.6/include/asm-sh64/cputime.h N 2.6/include/asm-parisc/cputime.h C 2.6/include/asm-ppc/io.h C 2.6/include/asm-ppc/pgtable.h N 2.6/include/asm-ppc/cputime.h N 2.6/include/asm-ppc/mv64x60.h N 2.6/include/asm-ppc/mv64x60_defs.h N 2.6/include/asm-ppc/perfmon.h N 2.6/include/asm-ppc/ppc_sys.h N 2.6/include/asm-ppc64/kdebug.h N 2.6/include/asm-ppc64/lppaca.h N 2.6/include/asm-ppc64/cputime.h N 2.6/include/asm-ppc64/kprobes.h N 2.6/include/asm-s390/cputime.h N 2.6/include/asm-sh/cputime.h N 2.6/include/asm-sparc/cputime.h N 2.6/include/asm-sparc64/cputime.h N 2.6/include/asm-um/apic.h N 2.6/include/asm-um/calling.h N 2.6/include/asm-um/archparam-x86_64.h N 2.6/include/asm-um/cputime.h N 2.6/include/asm-um/dwarf2.h N 2.6/include/asm-um/module-x86_64.h N 2.6/include/asm-um/pda.h N 2.6/include/asm-um/pgtable-2level.h N 2.6/include/asm-um/pgtable-3level.h N 2.6/include/asm-um/prctl.h N 2.6/include/asm-um/processor-x86_64.h N 2.6/include/asm-um/ptrace-x86_64.h N 2.6/include/asm-um/sigcontext-x86_64.h N 2.6/include/asm-um/system-x86_64.h N 2.6/include/asm-um/vm-flags-i386.h N 2.6/include/asm-um/vm-flags-x86_64.h N 2.6/include/asm-v850/cputime.h N 2.6/include/asm-x86_64/cputime.h N 2.6/include/linux/lcd.h N 2.6/include/linux/libps2.h N 2.6/include/linux/pcieport_if.h N 2.6/include/linux/backlight.h N 2.6/include/linux/debugfs.h N 2.6/include/linux/elf-fdpic.h N 2.6/include/linux/attribute_container.h N 2.6/include/linux/fsl_devices.h N 2.6/include/linux/i2c-algo-sgi.h N 2.6/include/linux/i2c-algo-sibyte.h N 2.6/include/linux/if_infiniband.h N 2.6/include/linux/transport_class.h N 2.6/include/linux/mtd/xip.h N 2.6/include/linux/netfilter_bridge/ebt_ulog.h N 2.6/include/media/tveeprom.h N 2.6/include/scsi/scsi_transport_iscsi.h N 2.6/include/video/w100fb.h N 2.6/include/asm-m32r/cputime.h N 2.6/include/asm-frv/a.out.h N 2.6/include/asm-frv/atomic.h N 2.6/include/asm-frv/ax88796.h N 2.6/include/asm-frv/bitops.h N 2.6/include/asm-frv/bug.h N 2.6/include/asm-frv/bugs.h N 2.6/include/asm-frv/busctl-regs.h N 2.6/include/asm-frv/byteorder.h N 2.6/include/asm-frv/cache.h N 2.6/include/asm-frv/cacheflush.h N 2.6/include/asm-frv/checksum.h N 2.6/include/asm-frv/cpu-irqs.h N 2.6/include/asm-frv/cpumask.h N 2.6/include/asm-frv/cputime.h N 2.6/include/asm-frv/current.h N 2.6/include/asm-frv/delay.h N 2.6/include/asm-frv/div64.h N 2.6/include/asm-frv/dm9000.h N 2.6/include/asm-frv/dma-mapping.h N 2.6/include/asm-frv/dma.h N 2.6/include/asm-frv/elf.h N 2.6/include/asm-frv/errno.h N 2.6/include/asm-frv/fcntl.h N 2.6/include/asm-frv/fpu.h N 2.6/include/asm-frv/gdb-stub.h N 2.6/include/asm-frv/gpio-regs.h N 2.6/include/asm-frv/hardirq.h N 2.6/include/asm-frv/highmem.h N 2.6/include/asm-frv/hw_irq.h N 2.6/include/asm-frv/ide.h N 2.6/include/asm-frv/init.h N 2.6/include/asm-frv/io.h N 2.6/include/asm-frv/ioctl.h N 2.6/include/asm-frv/ioctls.h N 2.6/include/asm-frv/ipc.h N 2.6/include/asm-frv/ipcbuf.h N 2.6/include/asm-frv/irc-regs.h N 2.6/include/asm-frv/irq-routing.h N 2.6/include/asm-frv/irq.h N 2.6/include/asm-frv/kmap_types.h N 2.6/include/asm-frv/linkage.h N 2.6/include/asm-frv/local.h N 2.6/include/asm-frv/math-emu.h N 2.6/include/asm-frv/mb-regs.h N 2.6/include/asm-frv/mb86943a.h N 2.6/include/asm-frv/mb93091-fpga-irqs.h N 2.6/include/asm-frv/mb93093-fpga-irqs.h N 2.6/include/asm-frv/mb93493-irqs.h N 2.6/include/asm-frv/mb93493-regs.h N 2.6/include/asm-frv/mem-layout.h N 2.6/include/asm-frv/mman.h N 2.6/include/asm-frv/mmu.h N 2.6/include/asm-frv/mmu_context.h N 2.6/include/asm-frv/module.h N 2.6/include/asm-frv/msgbuf.h N 2.6/include/asm-frv/namei.h N 2.6/include/asm-frv/page.h N 2.6/include/asm-frv/param.h N 2.6/include/asm-frv/pci.h N 2.6/include/asm-frv/percpu.h N 2.6/include/asm-frv/pgalloc.h N 2.6/include/asm-frv/pgtable.h N 2.6/include/asm-frv/poll.h N 2.6/include/asm-frv/posix_types.h N 2.6/include/asm-frv/processor.h N 2.6/include/asm-frv/ptrace.h N 2.6/include/asm-frv/registers.h N 2.6/include/asm-frv/resource.h N 2.6/include/asm-frv/scatterlist.h N 2.6/include/asm-frv/sections.h N 2.6/include/asm-frv/segment.h N 2.6/include/asm-frv/semaphore.h N 2.6/include/asm-frv/sembuf.h N 2.6/include/asm-frv/serial-regs.h N 2.6/include/asm-frv/serial.h N 2.6/include/asm-frv/setup.h N 2.6/include/asm-frv/shmbuf.h N 2.6/include/asm-frv/shmparam.h N 2.6/include/asm-frv/sigcontext.h N 2.6/include/asm-frv/siginfo.h N 2.6/include/asm-frv/signal.h N 2.6/include/asm-frv/smp.h N 2.6/include/asm-frv/socket.h N 2.6/include/asm-frv/sockios.h N 2.6/include/asm-frv/spinlock.h N 2.6/include/asm-frv/spr-regs.h N 2.6/include/asm-frv/stat.h N 2.6/include/asm-frv/statfs.h N 2.6/include/asm-frv/string.h N 2.6/include/asm-frv/suspend.h N 2.6/include/asm-frv/system.h N 2.6/include/asm-frv/termbits.h N 2.6/include/asm-frv/termios.h N 2.6/include/asm-frv/thread_info.h N 2.6/include/asm-frv/timer-regs.h N 2.6/include/asm-frv/timex.h N 2.6/include/asm-frv/tlb.h N 2.6/include/asm-frv/tlbflush.h N 2.6/include/asm-frv/topology.h N 2.6/include/asm-frv/types.h N 2.6/include/asm-frv/uaccess.h N 2.6/include/asm-frv/ucontext.h N 2.6/include/asm-frv/unaligned.h N 2.6/include/asm-frv/unistd.h N 2.6/include/asm-frv/user.h N 2.6/include/asm-frv/virtconvert.h N 2.6/init/calibrate.c N 2.6/lib/find_next_bit.c N 2.6/lib/prio_tree.c N 2.6/mm/internal.h N 2.6/net/bridge/netfilter/ebt_ulog.c N 2.6/scripts/kconfig/util.c N 2.6/sound/oss/au1550_ac97.c N 2.6/sound/pci/via82xx_modem.c N 2.6/sound/pci/emu10k1/emu10k1x.c N 2.6/sound/pci/emu10k1/timer.c N 2.6/sound/pci/ca0106/Makefile N 2.6/sound/pci/ca0106/ca0106.h N 2.6/sound/pci/ca0106/ca0106_main.c N 2.6/sound/pci/ca0106/ca0106_mixer.c N 2.6/sound/pci/ca0106/ca0106_proc.c N 2.6/sound/usb/usx2y/usx2yhwdeppcm.c N 2.6/sound/usb/usx2y/usx2yhwdeppcm.h N 2.6/sound/mips/Kconfig N 2.6/sound/mips/Makefile N 2.6/sound/mips/au1x00.c 15 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Roman Z. <zi...@us...> - 2005-07-30 20:49:32
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/pcmcia/
Changes by: zi...@sc....(none) 05/07/30 13:49:26
Log message:
conflict fixes from import of 2.6.10
Modified files:
./:
Makefile
2.6/arch/ppc/kernel/:
Makefile misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
pgtable.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
Removed files:
2.6/Documentation/:
digiboard.txt mkdev.ida
2.6/Documentation/DocBook/:
mousedrivers.tmpl
2.6/Documentation/dvb/:
firmware.txt
2.6/Documentation/isdn/:
README.eicon
2.6/Documentation/sound/oss/:
ChangeLog.awe ChangeLog.multisound
2.6/arch/arm/:
defconfig
2.6/arch/arm/boot/compressed/:
hw-bse.c
2.6/arch/arm/configs/:
adsbitsy_defconfig brutus_defconfig empeg_defconfig
flexanet_defconfig freebird_defconfig
freebird_new_defconfig graphicsclient_defconfig
graphicsmaster_defconfig huw_webpanel_defconfig
pangolin_defconfig pfs168_mqtft_defconfig
pfs168_mqvga_defconfig pfs168_sastn_defconfig
pfs168_satft_defconfig sherman_defconfig stork_defconfig
system3_defconfig trizeps_defconfig
2.6/arch/arm/lib/:
io-readsl-armv3.S io-readsl-armv4.S
2.6/arch/arm/mach-footbridge/:
arch.c irq.c mm.c
2.6/arch/arm/mach-iop3xx/:
arch.c iop321-mm.c iop331-mm.c mm-321.c
2.6/arch/arm/mach-omap/:
clocks.c
2.6/arch/arm/mach-sa1100/:
adsbitsy.c brutus.c empeg.c flexanet.c freebird.c
graphicsclient.c graphicsmaster.c huw_webpanel.c itsy.c
leds-adsbitsy.c leds-brutus.c leds-flexanet.c
leds-graphicsclient.c leds-graphicsmaster.c leds-pfs168.c
leds-system3.c nanoengine.c omnimeter.c pangolin.c
pfs168.c sherman.c stork.c system3.c trizeps.c xp860.c
yopy.c
2.6/arch/cris/arch-v10/drivers/:
ethernet.c ide.c serial.c serial.h
2.6/arch/h8300/platform/h8300h/aki3068net/:
ram.ld
2.6/arch/h8300/platform/h8300h/generic/:
ram.ld rom.ld
2.6/arch/h8300/platform/h8300h/h8max/:
ram.ld
2.6/arch/h8300/platform/h8s/edosk2674/:
ram.ld rom.ld
2.6/arch/h8300/platform/h8s/generic/:
ram.ld rom.ld
2.6/arch/i386/kernel/cpu/cpufreq/:
acpi.c
2.6/arch/i386/pci/:
changelog
2.6/arch/ia64/configs/:
generic_defconfig
2.6/arch/ia64/sn/io/:
Makefile cdl.c io.c snia_if.c xswitch.c
2.6/arch/ia64/sn/io/drivers/:
Makefile ioconfig_bus.c
2.6/arch/ia64/sn/io/hwgfs/:
Makefile hcl.c hcl_util.c interface.c labelcl.c ramfs.c
2.6/arch/ia64/sn/io/machvec/:
Makefile iomv.c pci.c pci_bus_cvlink.c pci_dma.c
2.6/arch/ia64/sn/io/platform_init/:
Makefile sgi_io_init.c
2.6/arch/ia64/sn/io/sn2/:
Makefile bte_error.c geo_op.c klconflib.c klgraph.c
l1_command.c ml_SN_init.c ml_SN_intr.c ml_iograph.c
module.c pciio.c pic.c shub.c shub_intr.c shuberror.c
shubio.c xbow.c xtalk.c
2.6/arch/ia64/sn/io/sn2/pcibr/:
Makefile pcibr_ate.c pcibr_config.c pcibr_dvr.c
pcibr_error.c pcibr_hints.c pcibr_intr.c pcibr_reg.c
pcibr_rrb.c pcibr_slot.c
2.6/arch/ia64/sn/kernel/:
probe.c
2.6/arch/m68knommu/platform/5282/:
Makefile config.c pit.c
2.6/arch/m68knommu/platform/5282/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5282/senTec/:
crt0_ram.S
2.6/arch/mips/baget/:
Makefile baget.c bagetIRQ.S balo.c balo_supp.S irq.c
ld.script.balo print.c reset.c setup.c time.c
2.6/arch/mips/baget/prom/:
Makefile init.c
2.6/arch/mips/configs/:
bosporus_defconfig mirage_defconfig mtx1_defconfig
pb1000_defconfig xxs1500_defconfig
2.6/arch/mips/ddb5xxx/common/:
irq.c
2.6/arch/mips/hp-lj/:
Makefile asic.c gdb_hook.c init.c int-handler.S irq.c
setup.c utils.c utils.h
2.6/arch/mips/mm/:
tlbex64-r4k.S
2.6/arch/mips/pci/:
fixup-lasat.c pci-hplj.c
2.6/arch/mips/ramdisk/:
Makefile ld.script
2.6/arch/parisc/kernel/:
head64.S
2.6/arch/ppc/8xx_io/:
uart.c
2.6/arch/ppc64/kernel/:
iSeries_IoMmTable.c iSeries_IoMmTable.h mf_proc.c
open_pic.c open_pic.h open_pic_defs.h open_pic_u3.c
2.6/arch/sh/tools/:
machgen.sh
2.6/arch/um/kernel/skas/:
exec_user.c
2.6/arch/um/kernel/skas/include/:
mmu.h mode.h mode_kern.h uaccess.h
2.6/arch/um/kernel/tt/include/:
mmu.h mode.h mode_kern.h uaccess.h
2.6/drivers/acpi/:
acpi_ksyms.c
2.6/drivers/char/:
README.computone README.cyclomY README.epca README.scc
2.6/drivers/ide/legacy/:
pdc4030.c pdc4030.h
2.6/drivers/ide/pci/:
hpt34x.h
2.6/drivers/media/dvb/dvb-core/:
Makefile.lib dvb_functions.c dvb_functions.h dvb_i2c.c
dvb_i2c.h dvb_ksyms.c
2.6/drivers/media/dvb/frontends/:
alps_tdlb7.c alps_tdmb7.c dst-bt878.h dst.c
grundig_29504-401.c grundig_29504-491.c sp887x_firm.h
2.6/drivers/mtd/:
mtdblock.h
2.6/drivers/mtd/maps/:
integrator-flash-v24.c
2.6/drivers/pci/hotplug/:
pciehp_sysfs.c
2.6/drivers/pcmcia/:
sa1100_adsbitsy.c sa1100_flexanet.c sa1100_freebird.c
sa1100_graphicsclient.c sa1100_graphicsmaster.c
sa1100_pangolin.c sa1100_pfs168.c sa1100_stork.c
sa1100_system3.c sa1100_trizeps.c sa1100_xp860.c
sa1100_yopy.c
2.6/drivers/scsi/:
dmx3191d.h i60uscsi.c i91uscsi.c i91uscsi.h ini9100u.c
ini9100u.h inia100.c inia100.h scsiiom.c
2.6/drivers/usb/host/:
hc_simple.c hc_simple.h hc_sl811.c hc_sl811.h
hc_sl811_rh.c
2.6/drivers/usb/misc/:
speedtch.c
2.6/fs/devpts/:
xattr.c xattr.h
2.6/fs/lockd/:
lockd_syms.c
2.6/include/asm-arm/arch-cl7500/:
serial.h
2.6/include/asm-arm/arch-ebsa110/:
serial.h
2.6/include/asm-arm/arch-ebsa285/:
serial.h
2.6/include/asm-arm/arch-epxa10db/:
serial.h
2.6/include/asm-arm/arch-h720x/:
serial.h
2.6/include/asm-arm/arch-imx/:
serial.h
2.6/include/asm-arm/arch-integrator/:
serial.h time.h
2.6/include/asm-arm/arch-iop3xx/:
serial.h
2.6/include/asm-arm/arch-ixp2000/:
serial.h
2.6/include/asm-arm/arch-ixp4xx/:
serial.h
2.6/include/asm-arm/arch-lh7a40x/:
serial.h
2.6/include/asm-arm/arch-omap/:
omap1610.h omap5912.h serial.h
2.6/include/asm-arm/arch-pxa/:
serial.h
2.6/include/asm-arm/arch-rpc/:
serial.h
2.6/include/asm-arm/arch-s3c2410/:
serial.h
2.6/include/asm-arm/arch-sa1100/:
adsbitsy.h flexanet.h freebird.h graphicsclient.h
graphicsmaster.h huw_webpanel.h itsy.h mftb2.h
omnimeter.h pangolin.h pfs168.h pleb.h serial.h stork.h
system3.h trizeps.h yopy.h
2.6/include/asm-arm/arch-shark/:
serial.h
2.6/include/asm-arm/arch-versatile/:
serial.h
2.6/include/asm-arm26/:
linux_logo.h
2.6/include/asm-h8300/:
linux_logo.h
2.6/include/asm-ia64/sn/:
cdl.h dmamap.h driver.h hcl.h hcl_util.h hwgfs.h
ifconfig_net.h ioc4.h ioconfig_bus.h ioerror.h
ioerror_handling.h iograph.h kldir.h labelcl.h pio.h
prio.h sgi.h slotnum.h sn_private.h vector.h
2.6/include/asm-ia64/sn/ksys/:
elsc.h l1.h
2.6/include/asm-ia64/sn/pci/:
bridge.h pci_bus_cvlink.h pci_defs.h pcibr.h
pcibr_private.h pciio.h pciio_private.h pic.h
2.6/include/asm-ia64/sn/sn2/:
addrs.h arch.h geo.h intr.h io.h shub.h shub_md.h
shub_mmr.h shub_mmr_t.h shubio.h slotnum.h sn_private.h
2.6/include/asm-ia64/sn/xtalk/:
xbow.h xbow_info.h xswitch.h xtalk.h xtalk_private.h
xtalkaddrs.h xwidget.h
2.6/include/asm-m68knommu/:
m5282sim.h shglcore.h shglports.h
2.6/include/asm-mips/:
pci_channel.h
2.6/include/asm-mips/baget/:
baget.h vac.h vic.h
2.6/include/asm-parisc/:
som.h
2.6/include/pcmcia/:
ftl.h memory.h
Revision Changes Path
1.13 +46 -21 2.6/Makefile
1.8 +1 -1 2.6/arch/ppc/kernel/Makefile
1.10 +3 -0 2.6/arch/ppc/kernel/misc.S
1.10 +1 -11 2.6/arch/ppc/kernel/ppc_ksyms.c
1.9 +4 -0 2.6/arch/ppc/kernel/setup.c
1.6 +3 -0 2.6/arch/ppc/kernel/time.c
1.9 +6 -6 2.6/arch/ppc/mm/pgtable.c
1.4 +2 -2 2.6/drivers/block/amiflop.c
1.4 +7 -0 2.6/include/asm-m68k/bootinfo.h
1.10 +197 -143 2.6/include/asm-ppc/io.h
1.7 +1 -0 2.6/include/asm-ppc/machdep.h
1.7 +2 -1 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2005-07-30 20:15:22
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 05/07/30 13:15:08 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29566 Log Message: import native 2.6.10 Status: Vendor Tag: linux Release Tags: linux-2_6_10 C 2.6/Makefile N 2.6/Documentation/ibm-acpi.txt N 2.6/Documentation/keys.txt N 2.6/Documentation/prio_tree.txt N 2.6/Documentation/seclvl.txt N 2.6/Documentation/stable_api_nonsense.txt N 2.6/Documentation/DocBook/librs.tmpl N 2.6/Documentation/DocBook/mtdnand.tmpl N 2.6/Documentation/arm/Samsung-S3C24XX/Suspend.txt N 2.6/Documentation/cdrom/packet-writing.txt N 2.6/Documentation/cpu-freq/cpufreq-nforce2.txt N 2.6/Documentation/i2c/i2c-stub N 2.6/Documentation/ia64/serial.txt N 2.6/Documentation/networking/proc_net_tcp.txt N 2.6/Documentation/power/kernel_threads.txt N 2.6/Documentation/power/video_extension.txt N 2.6/Documentation/s390/monreader.txt N 2.6/Documentation/usb/gadget_serial.txt N 2.6/Documentation/dvb/get_dvb_firmware N 2.6/Documentation/dvb/README.dibusb N 2.6/Documentation/dvb/udev.txt N 2.6/Documentation/ioctl/cdrom.txt N 2.6/Documentation/ioctl/hdio.txt N 2.6/arch/arm/common/icst307.c N 2.6/arch/arm/common/rtctime.c N 2.6/arch/arm/lib/io-readsl.S N 2.6/arch/arm/mach-lh7a40x/Makefile.boot N 2.6/arch/arm/mach-lh7a40x/common.h N 2.6/arch/arm/mach-clps711x/Makefile.boot N 2.6/arch/arm/mach-clps711x/common.h N 2.6/arch/arm/mach-clps7500/Makefile.boot N 2.6/arch/arm/mach-ebsa110/Makefile.boot N 2.6/arch/arm/mach-epxa10db/Makefile.boot N 2.6/arch/arm/mach-footbridge/isa.c N 2.6/arch/arm/mach-footbridge/co285.c N 2.6/arch/arm/mach-footbridge/Makefile.boot N 2.6/arch/arm/mach-footbridge/common.c N 2.6/arch/arm/mach-footbridge/common.h N 2.6/arch/arm/mach-footbridge/dc21285-timer.c N 2.6/arch/arm/mach-footbridge/ebsa285.c N 2.6/arch/arm/mach-footbridge/isa-timer.c N 2.6/arch/arm/mach-footbridge/personal.c N 2.6/arch/arm/mach-h720x/Makefile.boot N 2.6/arch/arm/mach-h720x/common.h N 2.6/arch/arm/mach-integrator/Makefile.boot N 2.6/arch/arm/mach-integrator/common.h N 2.6/arch/arm/mach-iop3xx/Makefile.boot N 2.6/arch/arm/mach-l7200/Makefile.boot N 2.6/arch/arm/mach-pxa/Makefile.boot N 2.6/arch/arm/mach-pxa/ssp.c N 2.6/arch/arm/mach-rpc/Makefile.boot N 2.6/arch/arm/mach-sa1100/Makefile.boot N 2.6/arch/arm/mach-shark/Makefile.boot N 2.6/arch/arm/mach-imx/Makefile.boot N 2.6/arch/arm/configs/simpad_defconfig N 2.6/arch/arm/mach-omap/pm.c N 2.6/arch/arm/mach-omap/Makefile.boot N 2.6/arch/arm/mach-omap/clock.c N 2.6/arch/arm/mach-omap/clock.h N 2.6/arch/arm/mach-omap/sleep.S N 2.6/arch/arm/mach-s3c2410/Makefile.boot N 2.6/arch/arm/mach-s3c2410/mach-rx3715.c N 2.6/arch/arm/mach-s3c2410/pm.c N 2.6/arch/arm/mach-s3c2410/pm.h N 2.6/arch/arm/mach-s3c2410/sleep.S N 2.6/arch/arm/mach-versatile/Kconfig N 2.6/arch/arm/mach-versatile/Makefile.boot N 2.6/arch/arm/mach-versatile/core.h N 2.6/arch/arm/mach-versatile/versatile_ab.c N 2.6/arch/arm/mach-versatile/versatile_pb.c N 2.6/arch/arm/mach-ixp4xx/Makefile.boot N 2.6/arch/arm/mach-ixp4xx/ixdpg425-pci.c N 2.6/arch/arm/mach-ixp2000/Makefile.boot N 2.6/arch/cris/arch-v10/kernel/crisksyms.c N 2.6/arch/i386/kernel/quirks.c N 2.6/arch/i386/kernel/acpi/earlyquirk.c N 2.6/arch/i386/kernel/cpu/intel_cacheinfo.c N 2.6/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c N 2.6/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c N 2.6/arch/ia64/kernel/domain.c N 2.6/arch/ia64/sn/pci/Makefile N 2.6/arch/ia64/sn/pci/pci_dma.c N 2.6/arch/ia64/sn/pci/pcibr/Makefile N 2.6/arch/ia64/sn/pci/pcibr/pcibr_ate.c N 2.6/arch/ia64/sn/pci/pcibr/pcibr_dma.c N 2.6/arch/ia64/sn/pci/pcibr/pcibr_provider.c N 2.6/arch/ia64/sn/pci/pcibr/pcibr_reg.c N 2.6/arch/ia64/sn/kernel/bte_error.c N 2.6/arch/ia64/sn/kernel/huberror.c N 2.6/arch/ia64/sn/kernel/io_init.c N 2.6/arch/ia64/sn/kernel/iomv.c N 2.6/arch/ia64/sn/kernel/klconflib.c N 2.6/arch/ia64/sn/include/ioerror.h N 2.6/arch/ia64/sn/include/shub.h N 2.6/arch/ia64/sn/include/shubio.h N 2.6/arch/ia64/sn/include/tio.h N 2.6/arch/ia64/sn/include/pci/pcibr_provider.h N 2.6/arch/ia64/sn/include/pci/pcibus_provider_defs.h N 2.6/arch/ia64/sn/include/pci/pcidev.h N 2.6/arch/ia64/sn/include/pci/pic.h N 2.6/arch/ia64/sn/include/pci/tiocp.h N 2.6/arch/ia64/sn/include/xtalk/hubdev.h N 2.6/arch/ia64/sn/include/xtalk/xbow.h N 2.6/arch/ia64/sn/include/xtalk/xwidgetdev.h N 2.6/arch/m68k/configs/amiga_defconfig N 2.6/arch/m68k/configs/apollo_defconfig N 2.6/arch/m68k/configs/atari_defconfig N 2.6/arch/m68k/configs/bvme6000_defconfig N 2.6/arch/m68k/configs/hp300_defconfig N 2.6/arch/m68k/configs/mac_defconfig N 2.6/arch/m68k/configs/mvme147_defconfig N 2.6/arch/m68k/configs/mvme16x_defconfig N 2.6/arch/m68k/configs/q40_defconfig N 2.6/arch/m68k/configs/sun3_defconfig N 2.6/arch/m68k/configs/sun3x_defconfig N 2.6/arch/m68knommu/lib/delay.c N 2.6/arch/m68knommu/platform/5272/CANCam/crt0_ram.S N 2.6/arch/m68knommu/platform/5272/SCALES/crt0_ram.S N 2.6/arch/m68knommu/platform/527x/Makefile N 2.6/arch/m68knommu/platform/527x/config.c N 2.6/arch/m68knommu/platform/527x/M5271EVB/crt0_ram.S N 2.6/arch/m68knommu/platform/527x/M5275EVB/crt0_ram.S N 2.6/arch/m68knommu/platform/5307/pit.c N 2.6/arch/m68knommu/platform/528x/Makefile N 2.6/arch/m68knommu/platform/528x/config.c N 2.6/arch/m68knommu/platform/528x/M5282EVB/crt0_ram.S N 2.6/arch/m68knommu/platform/528x/senTec/crt0_ram.S N 2.6/arch/mips/au1000/common/platform.c N 2.6/arch/mips/kernel/irq-msc01.c N 2.6/arch/mips/mm/tlbex.c N 2.6/arch/mips/mm/tlbex32-mips32.S N 2.6/arch/mips/momentum/ocelot_3/Makefile N 2.6/arch/mips/momentum/ocelot_3/int-handler.S N 2.6/arch/mips/momentum/ocelot_3/irq.c N 2.6/arch/mips/momentum/ocelot_3/ocelot_3_fpga.h N 2.6/arch/mips/momentum/ocelot_3/prom.c N 2.6/arch/mips/momentum/ocelot_3/reset.c N 2.6/arch/mips/momentum/ocelot_3/setup.c C 2.6/arch/mips/pci/pci-lasat.c N 2.6/arch/mips/pci/fixup-ocelot3.c N 2.6/arch/mips/configs/db1550_defconfig N 2.6/arch/mips/configs/ocelot_3_defconfig N 2.6/arch/parisc/install.sh N 2.6/arch/parisc/kernel/topology.c N 2.6/arch/parisc/lib/fixup.S N 2.6/arch/parisc/lib/memcpy.c C 2.6/arch/ppc/kernel/Makefile C 2.6/arch/ppc/kernel/misc.S C 2.6/arch/ppc/kernel/ppc_ksyms.c C 2.6/arch/ppc/kernel/setup.c C 2.6/arch/ppc/kernel/time.c C 2.6/arch/ppc/mm/pgtable.c N 2.6/arch/ppc/platforms/4xx/virtex-ii_pro.c N 2.6/arch/ppc/platforms/4xx/virtex-ii_pro.h N 2.6/arch/ppc/platforms/4xx/xilinx_ml300.c N 2.6/arch/ppc/platforms/4xx/xilinx_ml300.h N 2.6/arch/ppc/platforms/4xx/xparameters/xparameters_ml300.h N 2.6/arch/ppc/syslib/gen550.h N 2.6/arch/ppc/syslib/xilinx_pic.c N 2.6/arch/ppc64/kernel/mpic.c N 2.6/arch/ppc64/kernel/iSeries_smp.c N 2.6/arch/ppc64/kernel/maple_pci.c N 2.6/arch/ppc64/kernel/mpic.h N 2.6/arch/ppc64/kernel/pSeries_smp.c N 2.6/arch/ppc64/kernel/maple_setup.c N 2.6/arch/ppc64/kernel/maple_time.c N 2.6/arch/ppc64/lib/sstep.c N 2.6/arch/ppc64/configs/maple_defconfig N 2.6/arch/sh/boards/se/73180/Makefile N 2.6/arch/sh/boards/se/73180/io.c N 2.6/arch/sh/boards/se/73180/irq.c N 2.6/arch/sh/boards/se/73180/led.c N 2.6/arch/sh/boards/se/73180/setup.c N 2.6/arch/sh/boards/sh03/Makefile N 2.6/arch/sh/boards/sh03/led.c N 2.6/arch/sh/boards/sh03/rtc.c N 2.6/arch/sh/boards/sh03/setup.c N 2.6/arch/sh/boards/renesas/edosk7705/Makefile N 2.6/arch/sh/boards/renesas/edosk7705/io.c N 2.6/arch/sh/boards/renesas/edosk7705/setup.c N 2.6/arch/sh/boards/superh/microdev/Makefile N 2.6/arch/sh/boards/superh/microdev/io.c N 2.6/arch/sh/boards/superh/microdev/irq.c N 2.6/arch/sh/boards/superh/microdev/led.c N 2.6/arch/sh/boards/superh/microdev/setup.c N 2.6/arch/sh/configs/microdev_defconfig N 2.6/arch/sh/configs/se73180_defconfig N 2.6/arch/sh/configs/se7705_defconfig N 2.6/arch/sh/configs/sh03_defconfig N 2.6/arch/sh/kernel/asm-offsets.c N 2.6/arch/sh/kernel/cpu/sh2/probe.c N 2.6/arch/sh/kernel/cpu/sh3/probe.c N 2.6/arch/sh/kernel/cpu/sh4/probe.c N 2.6/arch/sh/lib/memcpy-sh4.S N 2.6/arch/sh/mm/cache-sh7705.c N 2.6/arch/sh/mm/pg-sh7705.c N 2.6/arch/sh/tools/gen-mach-types N 2.6/arch/sh/drivers/pci/fixups-sh03.c N 2.6/arch/sh/drivers/pci/ops-sh03.c N 2.6/arch/sh/oprofile/op_model_sh7750.c N 2.6/arch/um/Makefile-x86_64 N 2.6/arch/um/kernel/skas/include/uaccess-skas.h N 2.6/arch/um/kernel/skas/include/mode-skas.h N 2.6/arch/um/kernel/skas/include/mmu-skas.h N 2.6/arch/um/kernel/skas/include/mode_kern-skas.h N 2.6/arch/um/kernel/tt/include/uaccess-tt.h N 2.6/arch/um/kernel/tt/include/mode_kern-tt.h N 2.6/arch/um/kernel/tt/include/mmu-tt.h N 2.6/arch/um/kernel/tt/include/mode-tt.h N 2.6/arch/x86_64/kernel/genapic.c N 2.6/arch/x86_64/kernel/kprobes.c N 2.6/arch/x86_64/kernel/genapic_cluster.c N 2.6/arch/x86_64/kernel/genapic_flat.c N 2.6/arch/m32r/Kconfig.debug N 2.6/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB N 2.6/arch/m32r/mappi2/defconfig.vdec2 N 2.6/arch/m32r/mappi2/dot.gdbinit.vdec2 N 2.6/crypto/anubis.c N 2.6/drivers/acpi/video.c N 2.6/drivers/acpi/ibm_acpi.c C 2.6/drivers/block/amiflop.c N 2.6/drivers/block/pktcdvd.c N 2.6/drivers/char/ds1302.c N 2.6/drivers/char/mxser.h N 2.6/drivers/char/s3c2410-rtc.c N 2.6/drivers/char/watchdog/s3c2410_wdt.c N 2.6/drivers/dio/dio-driver.c N 2.6/drivers/dio/dio-sysfs.c N 2.6/drivers/i2c/busses/i2c-amd756-s4882.c N 2.6/drivers/i2c/busses/i2c-s3c2410.c N 2.6/drivers/i2c/busses/i2c-stub.c N 2.6/drivers/i2c/chips/adm1026.c N 2.6/drivers/i2c/chips/lm63.c N 2.6/drivers/i2c/chips/lm87.c N 2.6/drivers/i2c/chips/pc87360.c N 2.6/drivers/ide/cris/Makefile N 2.6/drivers/ide/cris/ide-v10.c N 2.6/drivers/md/faulty.c N 2.6/drivers/media/dvb/frontends/dvb_dummy_fe.h N 2.6/drivers/media/dvb/frontends/stv0297.c N 2.6/drivers/media/dvb/frontends/at76c651.h N 2.6/drivers/media/dvb/frontends/cx22700.c N 2.6/drivers/media/dvb/frontends/cx22700.h N 2.6/drivers/media/dvb/frontends/cx22702.c N 2.6/drivers/media/dvb/frontends/l64781.c N 2.6/drivers/media/dvb/frontends/l64781.h N 2.6/drivers/media/dvb/frontends/mt312_priv.h N 2.6/drivers/media/dvb/frontends/mt352.c N 2.6/drivers/media/dvb/frontends/cx22702.h N 2.6/drivers/media/dvb/frontends/cx24110.h N 2.6/drivers/media/dvb/frontends/dib3000-common.c N 2.6/drivers/media/dvb/frontends/dib3000-common.h N 2.6/drivers/media/dvb/frontends/dib3000.h N 2.6/drivers/media/dvb/frontends/dib3000mb.c N 2.6/drivers/media/dvb/frontends/dib3000mb_priv.h N 2.6/drivers/media/dvb/frontends/dib3000mc.c N 2.6/drivers/media/dvb/frontends/dib3000mc_priv.h N 2.6/drivers/media/dvb/frontends/mt352.h N 2.6/drivers/media/dvb/frontends/mt352_priv.h N 2.6/drivers/media/dvb/frontends/nxt6000_priv.h N 2.6/drivers/media/dvb/frontends/sp8870.c N 2.6/drivers/media/dvb/frontends/sp8870.h N 2.6/drivers/media/dvb/frontends/sp887x.h N 2.6/drivers/media/dvb/frontends/stv0297.h N 2.6/drivers/media/dvb/frontends/stv0299.h N 2.6/drivers/media/dvb/frontends/tda10021.c N 2.6/drivers/media/dvb/frontends/tda10021.h N 2.6/drivers/media/dvb/frontends/tda1004x.h N 2.6/drivers/media/dvb/frontends/tda8083.c N 2.6/drivers/media/dvb/frontends/tda8083.h N 2.6/drivers/media/dvb/frontends/tda80xx.c N 2.6/drivers/media/dvb/frontends/tda80xx.h N 2.6/drivers/media/dvb/frontends/ves1820.h N 2.6/drivers/media/dvb/frontends/ves1x93.h N 2.6/drivers/media/dvb/b2c2/b2c2-common.c N 2.6/drivers/media/dvb/b2c2/b2c2-usb-core.c N 2.6/drivers/media/dvb/ttusb-dec/ttusbdecfe.c N 2.6/drivers/media/dvb/ttusb-dec/ttusbdecfe.h N 2.6/drivers/media/dvb/bt8xx/dst.c N 2.6/drivers/media/dvb/bt8xx/dst.h N 2.6/drivers/media/dvb/bt8xx/dst_priv.h N 2.6/drivers/media/dvb/cinergyT2/Kconfig N 2.6/drivers/media/dvb/cinergyT2/Makefile N 2.6/drivers/media/dvb/cinergyT2/cinergyT2.c N 2.6/drivers/media/dvb/dibusb/Kconfig N 2.6/drivers/media/dvb/dibusb/Makefile N 2.6/drivers/media/dvb/dibusb/dvb-dibusb.c N 2.6/drivers/media/dvb/dibusb/dvb-dibusb.h N 2.6/drivers/media/video/arv.c N 2.6/drivers/media/video/video-buf-dvb.c N 2.6/drivers/media/video/saa7134/saa7134-dvb.c N 2.6/drivers/media/video/saa7134/saa7134-empress.c N 2.6/drivers/media/video/cx88/cx88-blackbird.c N 2.6/drivers/media/video/cx88/cx88-dvb.c N 2.6/drivers/media/video/cx88/cx88-mpeg.c N 2.6/drivers/mtd/chips/fwh_lock.h N 2.6/drivers/mtd/maps/bast-flash.c N 2.6/drivers/mtd/maps/ipaq-flash.c N 2.6/drivers/mtd/maps/ocotea.c N 2.6/drivers/mtd/maps/ts5500_flash.c N 2.6/drivers/mtd/nand/h1910.c N 2.6/drivers/mtd/nand/rtc_from4.c N 2.6/drivers/mtd/nand/s3c2410.c N 2.6/drivers/net/cris/Makefile N 2.6/drivers/net/cris/eth_v10.c N 2.6/drivers/pci/pci-acpi.c N 2.6/drivers/pci/rom.c N 2.6/drivers/pcmcia/m32r_cfc.c N 2.6/drivers/pcmcia/m32r_cfc.h N 2.6/drivers/pcmcia/m32r_pcc.c N 2.6/drivers/pcmcia/m32r_pcc.h N 2.6/drivers/pcmcia/pcmcia_compat.c N 2.6/drivers/pnp/pnpacpi/Kconfig N 2.6/drivers/pnp/pnpacpi/Makefile N 2.6/drivers/pnp/pnpacpi/core.c N 2.6/drivers/pnp/pnpacpi/pnpacpi.h N 2.6/drivers/pnp/pnpacpi/rsparser.c N 2.6/drivers/s390/char/monreader.c N 2.6/drivers/s390/char/vmlogrdr.c N 2.6/drivers/s390/char/vmwatchdog.c N 2.6/drivers/scsi/initio.c N 2.6/drivers/scsi/a100u2w.c N 2.6/drivers/scsi/initio.h N 2.6/drivers/scsi/ql1040_fw.h N 2.6/drivers/scsi/sata_uli.c N 2.6/drivers/scsi/a100u2w.h N 2.6/drivers/scsi/ahci.c N 2.6/drivers/scsi/aic7xxx/aic79xx_pci.h N 2.6/drivers/scsi/aic7xxx/aic7xxx_pci.h N 2.6/drivers/serial/8250_early.c N 2.6/drivers/serial/8250_hp300.c N 2.6/drivers/serial/crisv10.c N 2.6/drivers/serial/crisv10.h N 2.6/drivers/serial/imx.c N 2.6/drivers/serial/m32r_sio.c N 2.6/drivers/serial/m32r_sio.h N 2.6/drivers/serial/m32r_sio_reg.h N 2.6/drivers/usb/host/hc_crisv10.c N 2.6/drivers/usb/host/hc_crisv10.h N 2.6/drivers/usb/host/ohci-pxa27x.c N 2.6/drivers/usb/host/sl811-hcd.c N 2.6/drivers/usb/host/sl811.h N 2.6/drivers/usb/misc/phidgetkit.c N 2.6/drivers/usb/serial/cypress_m8.c N 2.6/drivers/usb/serial/cypress_m8.h N 2.6/drivers/usb/serial/ipw.c N 2.6/drivers/usb/atm/Kconfig N 2.6/drivers/usb/atm/Makefile N 2.6/drivers/usb/atm/speedtch.c N 2.6/drivers/usb/atm/usb_atm.c N 2.6/drivers/usb/atm/usb_atm.h N 2.6/drivers/video/console/bitblit.c N 2.6/drivers/video/console/tileblit.c N 2.6/drivers/video/intelfb/Makefile N 2.6/drivers/video/intelfb/intelfb.h N 2.6/drivers/video/intelfb/intelfbdrv.c N 2.6/drivers/video/intelfb/intelfbdrv.h N 2.6/drivers/video/intelfb/intelfbhw.c N 2.6/drivers/video/intelfb/intelfbhw.h N 2.6/drivers/video/savage/Makefile N 2.6/drivers/video/savage/savagefb-i2c.c N 2.6/drivers/video/savage/savagefb.c N 2.6/drivers/video/savage/savagefb.h N 2.6/drivers/video/savage/savagefb_accel.c N 2.6/drivers/mmc/wbsd.c N 2.6/drivers/mmc/wbsd.h N 2.6/fs/cifs/readdir.c N 2.6/fs/ext3/resize.c N 2.6/fs/hfs/attr.c N 2.6/fs/ntfs/aops.h N 2.6/fs/ntfs/runlist.c N 2.6/fs/ntfs/runlist.h N 2.6/include/asm-arm/rtc.h N 2.6/include/asm-arm/arch-pxa/ssp.h N 2.6/include/asm-arm/hardware/icst307.h N 2.6/include/asm-arm/mach/irda.h N 2.6/include/asm-arm/arch-omap/tc.h N 2.6/include/asm-arm/arch-omap/omap16xx.h N 2.6/include/asm-arm/arch-omap/cpu.h N 2.6/include/asm-arm/arch-s3c2410/idle.h N 2.6/include/asm-arm/arch-s3c2410/bast-pmu.h N 2.6/include/asm-arm/arch-s3c2410/iic.h N 2.6/include/asm-i386/pci-direct.h N 2.6/include/asm-ia64/sn/l1.h N 2.6/include/asm-ia64/sn/shub_mmr.h C 2.6/include/asm-m68k/bootinfo.h N 2.6/include/asm-m68k/hp300hw.h N 2.6/include/asm-m68knommu/m528xsim.h N 2.6/include/asm-m68knommu/m527xsim.h N 2.6/include/asm-mips/compiler.h N 2.6/include/asm-mips/cpu-info.h N 2.6/include/asm-mips/interrupt.h N 2.6/include/asm-mips/msc01_ic.h N 2.6/include/asm-mips/dec/serial.h N 2.6/include/asm-mips/tx4927/smsc_fdc37m81x.h N 2.6/include/asm-mips/mach-ip22/spaces.h N 2.6/include/asm-mips/mach-ip32/spaces.h N 2.6/include/asm-mips/mach-mips/cpu-feature-overrides.h N 2.6/include/asm-mips/mach-ocelot3/cpu-feature-overrides.h N 2.6/include/asm-mips/mach-sibyte/cpu-feature-overrides.h C 2.6/include/asm-ppc/io.h C 2.6/include/asm-ppc/machdep.h C 2.6/include/asm-ppc/pgtable.h N 2.6/include/asm-ppc/xparameters.h N 2.6/include/asm-ppc64/sstep.h N 2.6/include/asm-sh/irq-sh73180.h N 2.6/include/asm-sh/sh03/io.h N 2.6/include/asm-sh/sh03/sh03.h N 2.6/include/asm-sh/edosk7705/io.h N 2.6/include/asm-sh/microdev/io.h N 2.6/include/asm-sh/microdev/irq.h N 2.6/include/asm-sh/se73180/io.h N 2.6/include/asm-sh/se73180/se73180.h N 2.6/include/asm-x86_64/ipi.h N 2.6/include/asm-x86_64/genapic.h N 2.6/include/asm-x86_64/kprobes.h N 2.6/include/asm-x86_64/mach_apic.h N 2.6/include/linux/key-ui.h N 2.6/include/linux/key.h N 2.6/include/linux/keyctl.h N 2.6/include/linux/kfifo.h N 2.6/include/linux/rslib.h N 2.6/include/linux/via.h N 2.6/include/linux/nodemask.h N 2.6/include/linux/pci-acpi.h N 2.6/include/linux/kobject_uevent.h N 2.6/include/linux/pktcdvd.h N 2.6/include/linux/scatterlist.h N 2.6/include/linux/serial_8250.h N 2.6/include/linux/usb_sl811.h N 2.6/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h N 2.6/include/linux/netfilter_ipv4/ipt_CONNMARK.h N 2.6/include/linux/netfilter_ipv4/ipt_connmark.h N 2.6/include/linux/netfilter_ipv4/ipt_hashlimit.h N 2.6/include/linux/tc_act/tc_ipt.h N 2.6/include/linux/tc_act/tc_mirred.h N 2.6/include/linux/tc_act/tc_pedit.h N 2.6/include/media/video-buf-dvb.h N 2.6/include/net/act_api.h N 2.6/include/net/sch_generic.h N 2.6/include/net/x25device.h N 2.6/include/net/tc_act/tc_ipt.h N 2.6/include/net/tc_act/tc_mirred.h N 2.6/include/net/tc_act/tc_pedit.h N 2.6/kernel/kfifo.c N 2.6/kernel/ksysfs.c N 2.6/kernel/sys_ni.c N 2.6/kernel/wait.c N 2.6/kernel/irq/Makefile N 2.6/kernel/irq/autoprobe.c N 2.6/kernel/irq/handle.c N 2.6/kernel/irq/internals.h N 2.6/kernel/irq/manage.c N 2.6/kernel/irq/proc.c N 2.6/kernel/irq/spurious.c N 2.6/lib/kernel_lock.c N 2.6/lib/kobject_uevent.c N 2.6/lib/reed_solomon/Makefile N 2.6/lib/reed_solomon/decode_rs.c N 2.6/lib/reed_solomon/encode_rs.c N 2.6/lib/reed_solomon/reed_solomon.c N 2.6/net/appletalk/dev.c N 2.6/net/ipv4/netfilter/ipt_CLUSTERIP.c N 2.6/net/ipv4/netfilter/ipt_CONNMARK.c N 2.6/net/ipv4/netfilter/ipt_connmark.c N 2.6/net/ipv4/netfilter/ipt_hashlimit.c N 2.6/net/sched/ipt.c N 2.6/net/sched/mirred.c N 2.6/net/sched/pedit.c N 2.6/scripts/gen_initramfs_list.sh N 2.6/security/seclvl.c N 2.6/security/keys/Makefile N 2.6/security/keys/compat.c N 2.6/security/keys/internal.h N 2.6/security/keys/key.c N 2.6/security/keys/keyctl.c N 2.6/security/keys/keyring.c N 2.6/security/keys/proc.c N 2.6/security/keys/process_keys.c N 2.6/security/keys/request_key.c N 2.6/security/keys/user_defined.c N 2.6/sound/pci/ice1712/prodigy192.c N 2.6/sound/pci/ice1712/prodigy192.h N 2.6/sound/pci/ice1712/stac946x.h 13 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Roman Z. <zi...@us...> - 2005-07-30 18:53:03
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/net/ipv4/
Changes by: zi...@sc....(none) 05/07/30 11:52:54
Log message:
conflict fixes from import of 2.6.9
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile defconfig
2.6/arch/ppc/amiga/:
config.c
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
init.c pgtable.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-ppc/:
io.h
2.6/include/video/:
vga.h
Removed files:
2.6/Documentation/usb/:
philips.txt
2.6/arch/alpha/lib/:
io.c
2.6/arch/arm/configs/:
iq80310_defconfig
2.6/arch/arm/mach-iop3xx/:
iop310-irq.c iop310-pci.c iq80310-irq.c iq80310-pci.c
iq80310-time.c mm.c xs80200-irq.c
2.6/arch/arm/mach-omap/:
bus.c leds-perseus2.c
2.6/arch/i386/kernel/:
vsyscall.lds
2.6/arch/i386/power/:
pmdisk.S
2.6/arch/ia64/sn/fakeprom/:
Makefile README fpmem.c fpmem.h fprom.lds fpromasm.S
fw-emu.c klgraph_init.c main.c make_textsym runsim
2.6/arch/ppc/boot/include/:
zlib.h
2.6/arch/ppc/boot/lib/:
zlib.c
2.6/arch/ppc/boot/simple/:
chrpmap.S legacy.S
2.6/arch/ppc/platforms/:
est8260_setup.c lopec_pci.c lopec_serial.h lopec_setup.c
mcpn765_serial.h mvme5100_pci.c mvme5100_serial.h
mvme5100_setup.c powerpmc250_serial.h pq2ads_setup.c
prpmc750_serial.h prpmc800_serial.h rpx8260.c
2.6/arch/ppc64/boot/:
addSystemMap.c
2.6/arch/ppc64/kernel/:
chrp_setup.c pSeries_htab.c pmac_iommu.c stab.c
2.6/arch/sparc64/lib/:
U3copy_in_user.S VIScopy.S rwlock.S splock.S
2.6/arch/um/:
dyn.lds.S main.c uml.lds.S
2.6/arch/um/drivers/:
hostaudio_user.c
2.6/arch/um/include/:
Makefile hostaudio.h
2.6/arch/um/kernel/:
mprot.h user_syms.c vmlinux.lds.S
2.6/arch/um/sys-i386/:
extable.c
2.6/arch/x86_64/kernel/:
Makefile-HEAD domain.c
2.6/drivers/char/:
busmouse.c busmouse.h
2.6/drivers/i2c/:
i2c-sensor.c
2.6/drivers/message/fusion/:
ascq_tbl.c ascq_tbl.sh isense.c isense.h scsi3.h
scsiops.c
2.6/drivers/message/i2o/:
i2o_core.c
2.6/drivers/scsi/:
dc390.h
2.6/drivers/usb/host/:
ohci-omap.h
2.6/drivers/usb/media/:
pwc-ctrl.c pwc-if.c pwc-ioctl.h pwc-misc.c
pwc-uncompress.c pwc-uncompress.h pwc.h pwc_kiara.h
pwc_nala.h pwc_timon.h
2.6/fs/xfs/:
xfs_cap.c xfs_mac.c
2.6/include/asm-arm/arch-iop3xx/:
iop310-irqs.h iop310.h iq80310.h pmon.h
2.6/include/asm-arm/arch-omap/:
bus.h
2.6/include/asm-h8300/:
softirq.h
2.6/include/asm-mips/:
mv64340.h
2.6/include/asm-ppc64/:
bootx.h
2.6/include/asm-sh64/:
smplock.h softirq.h
2.6/include/asm-um/:
module.h smplock.h
2.6/include/linux/netfilter_ipv6/:
ip6t_REJECT.h
2.6/include/sound/:
sndmagic.h
2.6/kernel/power/:
pmdisk.c
2.6/lib/zlib_inflate/:
inffixed.h
2.6/net/ipv4/:
ip_nat_dumb.c
Revision Changes Path
1.12 +217 -115 2.6/Makefile
1.5 +18 -16 2.6/arch/ppc/Makefile
1.10 +24 -12 2.6/arch/ppc/defconfig
1.4 +0 -3 2.6/arch/ppc/amiga/config.c
1.10 +24 -12 2.6/arch/ppc/configs/apus_defconfig
1.7 +1 -1 2.6/arch/ppc/kernel/Makefile
1.7 +2 -2 2.6/arch/ppc/kernel/entry.S
1.9 +8 -8 2.6/arch/ppc/kernel/head.S
1.9 +15 -18 2.6/arch/ppc/kernel/misc.S
1.9 +4 -0 2.6/arch/ppc/kernel/ppc_ksyms.c
1.8 +7 -1 2.6/arch/ppc/kernel/setup.c
1.5 +10 -33 2.6/arch/ppc/kernel/time.c
1.6 +5 -0 2.6/arch/ppc/mm/init.c
1.8 +13 -0 2.6/arch/ppc/mm/pgtable.c
1.3 +2 -14 2.6/drivers/block/amiflop.c
1.9 +73 -1 2.6/include/asm-ppc/io.h
1.4 +23 -23 2.6/include/video/vga.h
|
|
From: Roman Z. <zi...@us...> - 2005-07-30 17:25:43
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 05/07/30 10:25:36 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31769 Log Message: import native 2.6.9 Status: Vendor Tag: linux Release Tags: linux-2_6_9 C 2.6/Makefile N 2.6/Documentation/tty.txt N 2.6/Documentation/ManagementStyle N 2.6/Documentation/sched-stats.txt N 2.6/Documentation/time_interpolators.txt N 2.6/Documentation/arm/IXP2000 N 2.6/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt N 2.6/Documentation/arm/Samsung-S3C24XX/GPIO.txt N 2.6/Documentation/arm/Samsung-S3C24XX/Overview.txt N 2.6/Documentation/networking/gen_stats.txt N 2.6/Documentation/scsi/megaraid.txt N 2.6/Documentation/RCU/RTFP.txt N 2.6/Documentation/RCU/UP.txt N 2.6/Documentation/RCU/arrayRCU.txt N 2.6/Documentation/RCU/checklist.txt N 2.6/Documentation/RCU/listRCU.txt N 2.6/Documentation/RCU/rcu.txt N 2.6/Documentation/i2o/README N 2.6/Documentation/i2o/ioctl N 2.6/arch/alpha/Kconfig.debug N 2.6/arch/alpha/kernel/io.c N 2.6/arch/arm/Kconfig.debug N 2.6/arch/arm/boot/compressed/big-endian.S N 2.6/arch/arm/kernel/iwmmxt.S N 2.6/arch/arm/mach-h720x/Kconfig N 2.6/arch/arm/mach-h720x/Makefile N 2.6/arch/arm/mach-h720x/common.c N 2.6/arch/arm/mach-h720x/cpu-h7201.c N 2.6/arch/arm/mach-h720x/cpu-h7202.c N 2.6/arch/arm/mach-h720x/h7201-eval.c N 2.6/arch/arm/mach-h720x/h7202-eval.c N 2.6/arch/arm/mach-iop3xx/common.c N 2.6/arch/arm/mach-iop3xx/iop331-pci.c N 2.6/arch/arm/mach-iop3xx/iop331-irq.c N 2.6/arch/arm/mach-iop3xx/iq80321-mm.c N 2.6/arch/arm/mach-iop3xx/iq80331-mm.c N 2.6/arch/arm/mach-iop3xx/iq80331-pci.c N 2.6/arch/arm/mach-iop3xx/iop321-setup.c N 2.6/arch/arm/mach-iop3xx/iop331-setup.c N 2.6/arch/arm/mach-iop3xx/iq31244-pci.c N 2.6/arch/arm/mach-iop3xx/iop331-time.c N 2.6/arch/arm/mach-iop3xx/iop321-mm.c N 2.6/arch/arm/mach-iop3xx/iop331-mm.c N 2.6/arch/arm/mach-iop3xx/iq31244-mm.c N 2.6/arch/arm/mach-imx/Kconfig N 2.6/arch/arm/mach-imx/Makefile N 2.6/arch/arm/mach-imx/dma.c N 2.6/arch/arm/mach-imx/generic.c N 2.6/arch/arm/mach-imx/generic.h N 2.6/arch/arm/mach-imx/irq.c N 2.6/arch/arm/mach-imx/leds-mx1ads.c N 2.6/arch/arm/mach-imx/leds.c N 2.6/arch/arm/mach-imx/leds.h N 2.6/arch/arm/mach-imx/mx1ads.c N 2.6/arch/arm/mach-imx/time.c N 2.6/arch/arm/mm/flush.c N 2.6/arch/arm/configs/enp2611_defconfig N 2.6/arch/arm/configs/iq31244_defconfig N 2.6/arch/arm/configs/iq80331_defconfig N 2.6/arch/arm/configs/ep80219_defconfig N 2.6/arch/arm/configs/h7201_defconfig N 2.6/arch/arm/configs/h7202_defconfig N 2.6/arch/arm/configs/ixdp2400_defconfig N 2.6/arch/arm/configs/ixdp2401_defconfig N 2.6/arch/arm/configs/ixdp2800_defconfig N 2.6/arch/arm/configs/ixdp2801_defconfig N 2.6/arch/arm/configs/mx1ads_defconfig N 2.6/arch/arm/mach-omap/mcbsp.c N 2.6/arch/arm/mach-omap/usb.c N 2.6/arch/arm/mach-omap/board-h2.c N 2.6/arch/arm/mach-omap/board-h3.c N 2.6/arch/arm/mach-omap/leds-h2p2-debug.c N 2.6/arch/arm/mach-s3c2410/clock.c N 2.6/arch/arm/mach-s3c2410/clock.h N 2.6/arch/arm/mach-s3c2410/cpu.c N 2.6/arch/arm/mach-s3c2410/cpu.h N 2.6/arch/arm/mach-s3c2410/devs.c N 2.6/arch/arm/mach-s3c2410/devs.h N 2.6/arch/arm/mach-s3c2410/dma.c N 2.6/arch/arm/mach-s3c2410/s3c2440-dsc.c N 2.6/arch/arm/mach-s3c2410/s3c2440.c N 2.6/arch/arm/mach-s3c2410/s3c2440.h N 2.6/arch/arm/mach-s3c2410/usb-simtec.c N 2.6/arch/arm/mach-s3c2410/usb-simtec.h N 2.6/arch/arm/mach-ixp2000/Kconfig N 2.6/arch/arm/mach-ixp2000/Makefile N 2.6/arch/arm/mach-ixp2000/core.c N 2.6/arch/arm/mach-ixp2000/enp2611.c N 2.6/arch/arm/mach-ixp2000/ixdp2400.c N 2.6/arch/arm/mach-ixp2000/ixdp2800.c N 2.6/arch/arm/mach-ixp2000/ixdp2x00.c N 2.6/arch/arm/mach-ixp2000/ixdp2x01.c N 2.6/arch/arm/mach-ixp2000/pci.c N 2.6/arch/arm26/Kconfig.debug N 2.6/arch/cris/Kconfig.debug N 2.6/arch/h8300/Kconfig.debug N 2.6/arch/i386/Kconfig.debug N 2.6/arch/i386/kernel/kprobes.c N 2.6/arch/i386/kernel/vsyscall.lds.S N 2.6/arch/i386/mm/mmap.c N 2.6/arch/ia64/Kconfig.debug N 2.6/arch/ia64/kernel/mca_drv.c N 2.6/arch/ia64/kernel/mca_drv.h N 2.6/arch/ia64/kernel/mca_drv_asm.S N 2.6/arch/ia64/sn/kernel/sn2/sn_hwperf.c N 2.6/arch/ia64/oprofile/perfmon.c N 2.6/arch/ia64/configs/tiger_defconfig N 2.6/arch/ia64/configs/bigsur_defconfig N 2.6/arch/m68k/Kconfig.debug N 2.6/arch/m68knommu/Kconfig.debug N 2.6/arch/mips/Kconfig.debug N 2.6/arch/sh64/Kconfig.debug N 2.6/arch/parisc/Kconfig.debug C 2.6/arch/ppc/Makefile N 2.6/arch/ppc/Kconfig.debug C 2.6/arch/ppc/amiga/config.c N 2.6/arch/ppc/boot/include/serial.h N 2.6/arch/ppc/boot/simple/chrpmap.c N 2.6/arch/ppc/boot/simple/pibs.c N 2.6/arch/ppc/boot/simple/prepmap.c C 2.6/arch/ppc/kernel/Makefile C 2.6/arch/ppc/kernel/entry.S C 2.6/arch/ppc/kernel/head.S C 2.6/arch/ppc/kernel/misc.S C 2.6/arch/ppc/kernel/ppc_ksyms.c C 2.6/arch/ppc/kernel/setup.c C 2.6/arch/ppc/kernel/time.c N 2.6/arch/ppc/kernel/head_booke.h C 2.6/arch/ppc/mm/init.c C 2.6/arch/ppc/mm/pgtable.c N 2.6/arch/ppc/platforms/pq2ads.c N 2.6/arch/ppc/platforms/mvme5100.c N 2.6/arch/ppc/platforms/lopec.c N 2.6/arch/ppc/platforms/lopec.h N 2.6/arch/ppc/syslib/m8xx_wdt.c N 2.6/arch/ppc/syslib/m8xx_wdt.h N 2.6/arch/ppc64/Kconfig.debug N 2.6/arch/ppc64/kernel/iomap.c N 2.6/arch/ppc64/kernel/pSeries_setup.c N 2.6/arch/ppc64/kernel/prom_init.c N 2.6/arch/ppc64/kernel/u3_iommu.c N 2.6/arch/ppc64/mm/hash_native.c N 2.6/arch/ppc64/mm/mmap.c N 2.6/arch/ppc64/mm/stab.c N 2.6/arch/s390/Kconfig.debug N 2.6/arch/s390/kernel/irq.c N 2.6/arch/s390/mm/mmap.c N 2.6/arch/sh/Kconfig.debug N 2.6/arch/sparc/Kconfig.debug N 2.6/arch/sparc64/Kconfig.debug N 2.6/arch/sparc64/kernel/kprobes.c N 2.6/arch/sparc64/lib/U3patch.S N 2.6/arch/sparc64/lib/memmove.S N 2.6/arch/sparc64/lib/delay.c N 2.6/arch/sparc64/lib/U1memcpy.S N 2.6/arch/sparc64/lib/user_fixup.c N 2.6/arch/sparc64/lib/U1copy_from_user.S N 2.6/arch/sparc64/lib/U1copy_to_user.S N 2.6/arch/sparc64/lib/copy_in_user.S N 2.6/arch/sparc64/lib/iomap.c N 2.6/arch/um/Kconfig.debug N 2.6/arch/um/drivers/cow.h N 2.6/arch/um/drivers/cow_sys.h N 2.6/arch/um/drivers/cow_user.c N 2.6/arch/um/include/irq_kern.h N 2.6/arch/um/include/mem_kern.h N 2.6/arch/um/kernel/main.c N 2.6/arch/um/kernel/physmem.c N 2.6/arch/um/kernel/uml.lds.S N 2.6/arch/um/kernel/dyn.lds.S N 2.6/arch/um/kernel/skas/uaccess.c N 2.6/arch/um/kernel/tt/uaccess.c N 2.6/arch/um/os-Linux/time.c N 2.6/arch/um/os-Linux/user_syms.c N 2.6/arch/v850/Kconfig.debug N 2.6/arch/x86_64/Kconfig.debug N 2.6/arch/x86_64/lib/bitops.c N 2.6/arch/x86_64/pci/Makefile-BUS N 2.6/arch/x86_64/pci/k8-bus.c N 2.6/arch/m32r/Kconfig N 2.6/arch/m32r/Makefile N 2.6/arch/m32r/defconfig N 2.6/arch/m32r/boot/Makefile N 2.6/arch/m32r/boot/setup.S N 2.6/arch/m32r/boot/compressed/Makefile N 2.6/arch/m32r/boot/compressed/boot.h N 2.6/arch/m32r/boot/compressed/head.S N 2.6/arch/m32r/boot/compressed/install.sh N 2.6/arch/m32r/boot/compressed/m32r_sio.c N 2.6/arch/m32r/boot/compressed/misc.c N 2.6/arch/m32r/boot/compressed/vmlinux.lds.S N 2.6/arch/m32r/boot/compressed/vmlinux.scr N 2.6/arch/m32r/kernel/Makefile N 2.6/arch/m32r/kernel/align.c N 2.6/arch/m32r/kernel/entry.S N 2.6/arch/m32r/kernel/head.S N 2.6/arch/m32r/kernel/init_task.c N 2.6/arch/m32r/kernel/io_m32700ut.c N 2.6/arch/m32r/kernel/io_mappi.c N 2.6/arch/m32r/kernel/io_mappi2.c N 2.6/arch/m32r/kernel/io_oaks32r.c N 2.6/arch/m32r/kernel/io_opsput.c N 2.6/arch/m32r/kernel/io_usrv.c N 2.6/arch/m32r/kernel/irq.c N 2.6/arch/m32r/kernel/m32r_ksyms.c N 2.6/arch/m32r/kernel/module.c N 2.6/arch/m32r/kernel/process.c N 2.6/arch/m32r/kernel/ptrace.c N 2.6/arch/m32r/kernel/semaphore.c N 2.6/arch/m32r/kernel/setup.c N 2.6/arch/m32r/kernel/setup_m32700ut.c N 2.6/arch/m32r/kernel/setup_mappi.c N 2.6/arch/m32r/kernel/setup_mappi2.c N 2.6/arch/m32r/kernel/setup_oaks32r.c N 2.6/arch/m32r/kernel/setup_opsput.c N 2.6/arch/m32r/kernel/setup_usrv.c N 2.6/arch/m32r/kernel/signal.c N 2.6/arch/m32r/kernel/smp.c N 2.6/arch/m32r/kernel/smpboot.c N 2.6/arch/m32r/kernel/sys_m32r.c N 2.6/arch/m32r/kernel/time.c N 2.6/arch/m32r/kernel/traps.c N 2.6/arch/m32r/kernel/vmlinux.lds.S N 2.6/arch/m32r/lib/Makefile N 2.6/arch/m32r/lib/ashxdi3.S N 2.6/arch/m32r/lib/checksum.S N 2.6/arch/m32r/lib/csum_partial_copy.c N 2.6/arch/m32r/lib/delay.c N 2.6/arch/m32r/lib/getuser.S N 2.6/arch/m32r/lib/memcpy.S N 2.6/arch/m32r/lib/memset.S N 2.6/arch/m32r/lib/putuser.S N 2.6/arch/m32r/lib/strlen.S N 2.6/arch/m32r/lib/usercopy.c N 2.6/arch/m32r/m32700ut/defconfig.m32700ut.smp N 2.6/arch/m32r/m32700ut/defconfig.m32700ut.up N 2.6/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB N 2.6/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB N 2.6/arch/m32r/mappi/defconfig.nommu N 2.6/arch/m32r/mappi/defconfig.smp N 2.6/arch/m32r/mappi/defconfig.up N 2.6/arch/m32r/mappi/dot.gdbinit N 2.6/arch/m32r/mappi/dot.gdbinit.nommu N 2.6/arch/m32r/mappi/dot.gdbinit.smp N 2.6/arch/m32r/mm/Makefile N 2.6/arch/m32r/mm/cache.c N 2.6/arch/m32r/mm/discontig.c N 2.6/arch/m32r/mm/extable.c N 2.6/arch/m32r/mm/fault-nommu.c N 2.6/arch/m32r/mm/fault.c N 2.6/arch/m32r/mm/init.c N 2.6/arch/m32r/mm/ioremap-nommu.c N 2.6/arch/m32r/mm/ioremap.c N 2.6/arch/m32r/mm/mmu.S N 2.6/arch/m32r/mm/page.S N 2.6/arch/m32r/oaks32r/defconfig.nommu N 2.6/arch/m32r/oaks32r/dot.gdbinit.nommu N 2.6/arch/m32r/oprofile/Kconfig N 2.6/arch/m32r/oprofile/Makefile N 2.6/arch/m32r/oprofile/init.c N 2.6/arch/m32r/opsput/defconfig.opsput N 2.6/arch/m32r/opsput/dot.gdbinit N 2.6/crypto/wp512.c N 2.6/drivers/acpi/motherboard.c N 2.6/drivers/acpi/sleep/wakeup.c C 2.6/drivers/block/amiflop.c N 2.6/drivers/block/ub.c N 2.6/drivers/char/hvsi.c N 2.6/drivers/char/mmtimer.c N 2.6/drivers/char/snsc.c N 2.6/drivers/char/snsc.h N 2.6/drivers/char/drm/drm_core.h N 2.6/drivers/char/drm/i915_dma.c N 2.6/drivers/char/drm/i915_drm.h N 2.6/drivers/char/drm/i915_drv.c N 2.6/drivers/char/drm/i915.h N 2.6/drivers/char/drm/i915_drv.h N 2.6/drivers/char/drm/i915_irq.c N 2.6/drivers/char/drm/i915_mem.c N 2.6/drivers/char/ipmi/ipmi_poweroff.c N 2.6/drivers/char/watchdog/mpc8xx_wdt.c N 2.6/drivers/cpufreq/cpufreq_ondemand.c N 2.6/drivers/i2c/i2c-sensor-detect.c N 2.6/drivers/i2c/i2c-sensor-vid.c N 2.6/drivers/i2c/busses/i2c-ixp2000.c N 2.6/drivers/i2c/busses/i2c-mpc.c N 2.6/drivers/i2c/busses/i2c-pca-isa.c N 2.6/drivers/i2c/chips/isp1301_omap.c N 2.6/drivers/i2c/chips/smsc47m1.c N 2.6/drivers/i2c/algos/i2c-algo-pca.c N 2.6/drivers/i2c/algos/i2c-algo-pca.h N 2.6/drivers/ide/arm/bast-ide.c N 2.6/drivers/input/serio/serio_raw.c N 2.6/drivers/md/raid10.c N 2.6/drivers/message/i2o/iop.c N 2.6/drivers/message/i2o/debug.c N 2.6/drivers/message/i2o/device.c N 2.6/drivers/message/i2o/driver.c N 2.6/drivers/message/i2o/exec-osm.c N 2.6/drivers/message/i2o/i2o_block.h N 2.6/drivers/message/i2o/pci.c N 2.6/drivers/mtd/maps/ixp2000.c N 2.6/drivers/net/gianfar.c N 2.6/drivers/net/gianfar.h N 2.6/drivers/net/gianfar_ethtool.c N 2.6/drivers/net/gianfar_phy.c N 2.6/drivers/net/gianfar_phy.h N 2.6/drivers/net/gt64240eth.h N 2.6/drivers/net/mv643xx_eth.c N 2.6/drivers/net/mv643xx_eth.h N 2.6/drivers/pci/hotplug/acpiphp_ibm.c N 2.6/drivers/scsi/ibmvscsi/Makefile N 2.6/drivers/scsi/ibmvscsi/ibmvscsi.c N 2.6/drivers/scsi/ibmvscsi/ibmvscsi.h N 2.6/drivers/scsi/ibmvscsi/iseries_vscsi.c N 2.6/drivers/scsi/ibmvscsi/rpa_vscsi.c N 2.6/drivers/scsi/ibmvscsi/srp.h N 2.6/drivers/scsi/ibmvscsi/viosrp.h N 2.6/drivers/scsi/megaraid/Kconfig.megaraid N 2.6/drivers/scsi/megaraid/Makefile N 2.6/drivers/scsi/megaraid/mbox_defs.h N 2.6/drivers/scsi/megaraid/mega_common.h N 2.6/drivers/scsi/megaraid/megaraid_ioctl.h N 2.6/drivers/scsi/megaraid/megaraid_mbox.c N 2.6/drivers/scsi/megaraid/megaraid_mbox.h N 2.6/drivers/scsi/megaraid/megaraid_mm.c N 2.6/drivers/scsi/megaraid/megaraid_mm.h N 2.6/drivers/serial/icom.c N 2.6/drivers/serial/icom.h N 2.6/drivers/usb/core/otg_whitelist.h N 2.6/drivers/usb/gadget/lh7a40x_udc.c N 2.6/drivers/usb/gadget/lh7a40x_udc.h N 2.6/drivers/usb/gadget/omap_udc.c N 2.6/drivers/usb/gadget/omap_udc.h N 2.6/drivers/usb/media/sn9c102_pas202bcb.c N 2.6/drivers/video/amba-clcd.c N 2.6/drivers/w1/ds_w1_bridge.c N 2.6/drivers/w1/dscore.c N 2.6/drivers/w1/dscore.h N 2.6/drivers/w1/w1_smem.c N 2.6/drivers/mmc/Kconfig N 2.6/drivers/mmc/Makefile N 2.6/drivers/mmc/mmc.c N 2.6/drivers/mmc/mmc.h N 2.6/drivers/mmc/mmc_block.c N 2.6/drivers/mmc/mmc_queue.c N 2.6/drivers/mmc/mmc_queue.h N 2.6/drivers/mmc/mmc_sysfs.c N 2.6/drivers/mmc/mmci.c N 2.6/drivers/mmc/mmci.h N 2.6/drivers/mmc/pxamci.c N 2.6/drivers/mmc/pxamci.h N 2.6/fs/nfs/callback.c N 2.6/fs/nfs/callback.h N 2.6/fs/nfs/callback_proc.c N 2.6/fs/nfs/callback_xdr.c N 2.6/fs/nfs/delegation.c N 2.6/fs/nfs/delegation.h N 2.6/fs/nfsd/nfs4acl.c N 2.6/fs/ntfs/bitmap.c N 2.6/fs/ntfs/bitmap.h N 2.6/fs/ntfs/lcnalloc.c N 2.6/fs/ntfs/lcnalloc.h N 2.6/fs/xfs/linux-2.6/xfs_ioctl32.c N 2.6/fs/xfs/linux-2.6/xfs_ioctl32.h N 2.6/fs/hostfs/Makefile N 2.6/fs/hostfs/hostfs.h N 2.6/fs/hostfs/hostfs_kern.c N 2.6/fs/hostfs/hostfs_user.c N 2.6/fs/hppfs/Makefile N 2.6/fs/hppfs/hppfs_kern.c N 2.6/include/asm-alpha/io_trivial.h N 2.6/include/asm-arm/arch-iop3xx/iop331-irqs.h N 2.6/include/asm-arm/arch-iop3xx/iop331.h N 2.6/include/asm-arm/arch-iop3xx/iq80331.h N 2.6/include/asm-arm/arch-iop3xx/iq31244.h N 2.6/include/asm-arm/arch-pxa/mmc.h N 2.6/include/asm-arm/hardware/amba_clcd.h N 2.6/include/asm-arm/mach/mmc.h N 2.6/include/asm-arm/arch-imx/dma.h N 2.6/include/asm-arm/arch-imx/hardware.h N 2.6/include/asm-arm/arch-imx/imx-regs.h N 2.6/include/asm-arm/arch-imx/io.h N 2.6/include/asm-arm/arch-imx/irq.h N 2.6/include/asm-arm/arch-imx/irqs.h N 2.6/include/asm-arm/arch-imx/memory.h N 2.6/include/asm-arm/arch-imx/mx1ads.h N 2.6/include/asm-arm/arch-imx/param.h N 2.6/include/asm-arm/arch-imx/serial.h N 2.6/include/asm-arm/arch-imx/system.h N 2.6/include/asm-arm/arch-imx/timex.h N 2.6/include/asm-arm/arch-imx/uncompress.h N 2.6/include/asm-arm/arch-imx/vmalloc.h N 2.6/include/asm-arm/arch-omap/mcbsp.h N 2.6/include/asm-arm/arch-omap/tps65010.h N 2.6/include/asm-arm/arch-omap/usb.h N 2.6/include/asm-arm/arch-s3c2410/nand.h N 2.6/include/asm-arm/arch-s3c2410/regs-dsc.h N 2.6/include/asm-arm/arch-s3c2410/regs-gpioj.h N 2.6/include/asm-arm/arch-s3c2410/regs-iic.h N 2.6/include/asm-arm/arch-s3c2410/regs-mem.h N 2.6/include/asm-arm/arch-s3c2410/regs-nand.h N 2.6/include/asm-arm/arch-s3c2410/regs-sdi.h N 2.6/include/asm-arm/arch-s3c2410/regs-spi.h N 2.6/include/asm-arm/arch-s3c2410/regs-udc.h N 2.6/include/asm-arm/arch-s3c2410/usb-control.h N 2.6/include/asm-arm/arch-h720x/boards.h N 2.6/include/asm-arm/arch-h720x/dma.h N 2.6/include/asm-arm/arch-h720x/h7201-regs.h N 2.6/include/asm-arm/arch-h720x/h7202-regs.h N 2.6/include/asm-arm/arch-h720x/hardware.h N 2.6/include/asm-arm/arch-h720x/io.h N 2.6/include/asm-arm/arch-h720x/irq.h N 2.6/include/asm-arm/arch-h720x/irqs.h N 2.6/include/asm-arm/arch-h720x/memory.h N 2.6/include/asm-arm/arch-h720x/param.h N 2.6/include/asm-arm/arch-h720x/serial.h N 2.6/include/asm-arm/arch-h720x/system.h N 2.6/include/asm-arm/arch-h720x/timex.h N 2.6/include/asm-arm/arch-h720x/uncompress.h N 2.6/include/asm-arm/arch-h720x/vmalloc.h N 2.6/include/asm-arm/arch-ixp2000/dma.h N 2.6/include/asm-arm/arch-ixp2000/enp2611.h N 2.6/include/asm-arm/arch-ixp2000/gpio.h N 2.6/include/asm-arm/arch-ixp2000/hardware.h N 2.6/include/asm-arm/arch-ixp2000/io.h N 2.6/include/asm-arm/arch-ixp2000/irq.h N 2.6/include/asm-arm/arch-ixp2000/irqs.h N 2.6/include/asm-arm/arch-ixp2000/ixdp2x00.h N 2.6/include/asm-arm/arch-ixp2000/ixdp2x01.h N 2.6/include/asm-arm/arch-ixp2000/ixp2000-regs.h N 2.6/include/asm-arm/arch-ixp2000/memory.h N 2.6/include/asm-arm/arch-ixp2000/param.h N 2.6/include/asm-arm/arch-ixp2000/platform.h N 2.6/include/asm-arm/arch-ixp2000/system.h N 2.6/include/asm-arm/arch-ixp2000/serial.h N 2.6/include/asm-arm/arch-ixp2000/timex.h N 2.6/include/asm-arm/arch-ixp2000/uncompress.h N 2.6/include/asm-arm/arch-ixp2000/vmalloc.h N 2.6/include/asm-generic/bug.h N 2.6/include/asm-generic/iomap.h N 2.6/include/asm-generic/uaccess.h N 2.6/include/asm-i386/kdebug.h N 2.6/include/asm-i386/kprobes.h N 2.6/include/asm-ia64/sn/sn2/sn_hwperf.h C 2.6/include/asm-ppc/io.h N 2.6/include/asm-ppc/8253pit.h N 2.6/include/asm-ppc64/plpar_wrappers.h N 2.6/include/asm-ppc64/8253pit.h N 2.6/include/asm-sparc64/kprobes.h N 2.6/include/asm-um/local.h N 2.6/include/asm-um/cpufeature.h N 2.6/include/asm-um/module-generic.h N 2.6/include/asm-um/module-i386.h N 2.6/include/asm-um/sections.h N 2.6/include/asm-x86_64/swiotlb.h N 2.6/include/linux/kprobes.h N 2.6/include/linux/mv643xx.h N 2.6/include/linux/ramfs.h N 2.6/include/linux/gen_stats.h N 2.6/include/linux/hardirq.h N 2.6/include/linux/i2c-algo-pca.h N 2.6/include/linux/mmtimer.h N 2.6/include/linux/nfs4_acl.h N 2.6/include/linux/usb_otg.h N 2.6/include/linux/netfilter_ipv4/ip_conntrack_sctp.h N 2.6/include/linux/netfilter_ipv4/ipt_comment.h N 2.6/include/linux/netfilter_ipv4/ipt_sctp.h N 2.6/include/linux/netfilter_ipv6/ip6t_physdev.h N 2.6/include/linux/raid/raid10.h N 2.6/include/linux/sunrpc/gss_spkm3.h N 2.6/include/linux/mmc/card.h N 2.6/include/linux/mmc/host.h N 2.6/include/linux/mmc/mmc.h N 2.6/include/linux/mmc/protocol.h N 2.6/include/linux/tc_act/tc_gact.h N 2.6/include/net/gen_stats.h N 2.6/include/net/tc_act/tc_gact.h N 2.6/include/sound/pcm-indirect.h C 2.6/include/video/vga.h N 2.6/include/video/epson1355.h N 2.6/include/asm-m32r/a.out.h N 2.6/include/asm-m32r/addrspace.h N 2.6/include/asm-m32r/assembler.h N 2.6/include/asm-m32r/atomic.h N 2.6/include/asm-m32r/bitops.h N 2.6/include/asm-m32r/bug.h N 2.6/include/asm-m32r/bugs.h N 2.6/include/asm-m32r/byteorder.h N 2.6/include/asm-m32r/cache.h N 2.6/include/asm-m32r/cachectl.h N 2.6/include/asm-m32r/cacheflush.h N 2.6/include/asm-m32r/checksum.h N 2.6/include/asm-m32r/current.h N 2.6/include/asm-m32r/delay.h N 2.6/include/asm-m32r/div64.h N 2.6/include/asm-m32r/dma-mapping.h N 2.6/include/asm-m32r/dma.h N 2.6/include/asm-m32r/elf.h N 2.6/include/asm-m32r/errno.h N 2.6/include/asm-m32r/fcntl.h N 2.6/include/asm-m32r/flat.h N 2.6/include/asm-m32r/hardirq.h N 2.6/include/asm-m32r/hdreg.h N 2.6/include/asm-m32r/hw_irq.h N 2.6/include/asm-m32r/ide.h N 2.6/include/asm-m32r/io.h N 2.6/include/asm-m32r/ioctl.h N 2.6/include/asm-m32r/ioctls.h N 2.6/include/asm-m32r/ipc.h N 2.6/include/asm-m32r/ipcbuf.h N 2.6/include/asm-m32r/irq.h N 2.6/include/asm-m32r/kmap_types.h N 2.6/include/asm-m32r/linkage.h N 2.6/include/asm-m32r/local.h N 2.6/include/asm-m32r/m32102.h N 2.6/include/asm-m32r/m32102peri.h N 2.6/include/asm-m32r/m32r.h N 2.6/include/asm-m32r/m32r_mp_fpga.h N 2.6/include/asm-m32r/mc146818rtc.h N 2.6/include/asm-m32r/mman.h N 2.6/include/asm-m32r/mmu.h N 2.6/include/asm-m32r/mmu_context.h N 2.6/include/asm-m32r/mmzone.h N 2.6/include/asm-m32r/module.h N 2.6/include/asm-m32r/msgbuf.h N 2.6/include/asm-m32r/namei.h N 2.6/include/asm-m32r/numnodes.h N 2.6/include/asm-m32r/page.h N 2.6/include/asm-m32r/param.h N 2.6/include/asm-m32r/pci.h N 2.6/include/asm-m32r/percpu.h N 2.6/include/asm-m32r/pgalloc.h N 2.6/include/asm-m32r/pgtable-2level.h N 2.6/include/asm-m32r/pgtable.h N 2.6/include/asm-m32r/poll.h N 2.6/include/asm-m32r/posix_types.h N 2.6/include/asm-m32r/processor.h N 2.6/include/asm-m32r/ptrace.h N 2.6/include/asm-m32r/resource.h N 2.6/include/asm-m32r/rtc.h N 2.6/include/asm-m32r/scatterlist.h N 2.6/include/asm-m32r/sections.h N 2.6/include/asm-m32r/segment.h N 2.6/include/asm-m32r/semaphore.h N 2.6/include/asm-m32r/sembuf.h N 2.6/include/asm-m32r/serial.h N 2.6/include/asm-m32r/setup.h N 2.6/include/asm-m32r/shmbuf.h N 2.6/include/asm-m32r/shmparam.h N 2.6/include/asm-m32r/sigcontext.h N 2.6/include/asm-m32r/siginfo.h N 2.6/include/asm-m32r/signal.h N 2.6/include/asm-m32r/smp.h N 2.6/include/asm-m32r/socket.h N 2.6/include/asm-m32r/sockios.h N 2.6/include/asm-m32r/spinlock.h N 2.6/include/asm-m32r/stat.h N 2.6/include/asm-m32r/statfs.h N 2.6/include/asm-m32r/string.h N 2.6/include/asm-m32r/syscall.h N 2.6/include/asm-m32r/system.h N 2.6/include/asm-m32r/termbits.h N 2.6/include/asm-m32r/termios.h N 2.6/include/asm-m32r/thread_info.h N 2.6/include/asm-m32r/timex.h N 2.6/include/asm-m32r/tlb.h N 2.6/include/asm-m32r/tlbflush.h N 2.6/include/asm-m32r/topology.h N 2.6/include/asm-m32r/types.h N 2.6/include/asm-m32r/uaccess.h N 2.6/include/asm-m32r/ucontext.h N 2.6/include/asm-m32r/unaligned.h N 2.6/include/asm-m32r/unistd.h N 2.6/include/asm-m32r/user.h N 2.6/include/asm-m32r/vga.h N 2.6/include/asm-m32r/xor.h N 2.6/include/asm-m32r/m32700ut/m32700ut_lan.h N 2.6/include/asm-m32r/m32700ut/m32700ut_lcd.h N 2.6/include/asm-m32r/m32700ut/m32700ut_pld.h N 2.6/include/asm-m32r/mappi2/mappi2_pld.h N 2.6/include/asm-m32r/opsput/opsput_lan.h N 2.6/include/asm-m32r/opsput/opsput_lcd.h N 2.6/include/asm-m32r/opsput/opsput_pld.h N 2.6/kernel/kprobes.c N 2.6/kernel/spinlock.c N 2.6/lib/Kconfig.debug N 2.6/lib/iomap.c N 2.6/lib/zlib_inflate/inflate_sync.c N 2.6/mm/thrash.c N 2.6/mm/tiny-shmem.c N 2.6/net/core/gen_estimator.c N 2.6/net/core/gen_stats.c N 2.6/net/ipv4/fib_lookup.h N 2.6/net/ipv4/netfilter/ip_conntrack_proto_sctp.c N 2.6/net/ipv4/netfilter/ipt_comment.c N 2.6/net/ipv4/netfilter/ipt_sctp.c N 2.6/net/ipv6/netfilter/ip6t_physdev.c N 2.6/net/sched/gact.c N 2.6/net/sunrpc/auth_gss/gss_spkm3_mech.c N 2.6/net/sunrpc/auth_gss/gss_spkm3_seal.c N 2.6/net/sunrpc/auth_gss/gss_spkm3_token.c N 2.6/net/sunrpc/auth_gss/gss_spkm3_unseal.c N 2.6/scripts/Makefile.host N 2.6/scripts/mksysmap N 2.6/scripts/namespace.pl N 2.6/sound/pci/atiixp_modem.c N 2.6/sound/pci/ice1712/pontis.c N 2.6/sound/pci/ice1712/pontis.h N 2.6/sound/pci/ice1712/vt1720_mobo.c N 2.6/sound/pci/ice1712/vt1720_mobo.h N 2.6/sound/ppc/beep.c N 2.6/sound/usb/usx2y/Makefile N 2.6/sound/usb/usx2y/usX2Yhwdep.c N 2.6/sound/usb/usx2y/usX2Yhwdep.h N 2.6/sound/usb/usx2y/usbus428ctldefs.h N 2.6/sound/usb/usx2y/usbusx2y.c N 2.6/sound/usb/usx2y/usbusx2y.h N 2.6/sound/usb/usx2y/usbusx2yaudio.c N 2.6/sound/usb/usx2y/usx2y.h 15 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Geert U. <ge...@li...> - 2005-07-26 17:10:05
|
FYI...
---------- Forwarded message ----------
Date: Mon, 25 Jul 2005 23:18:12 -0500
From: Kumar Gala <kum...@fr...>
To: Embedded PPC Linux list <lin...@oz...>,
linuxppc-dev list <lin...@oz...>
Subject: platform/board removal update
All,
I'm going to be sending a series of patches to remove the following
board/platforms (as discussed earlier):
adir
ash
beech
cedar
ep405
k2
mcpn765
menf1
oak
pcore
rainier
redwood
sm850
spd823ts
The following board/platforms are currently not building:
apus
gemini
lite5200
prpmc750
radstone_ppc7d
rpxcllf
TQM8260
At OLS, Paul and the various sub-arch maintainers (in attendance) discussed that
if the set of board/platforms that are not building are not fixed by the release
of 2.6.15 we will be removing support for them. Some of the build issues are
trivial and I may look at fixing them myself. For all of the systems that I
dont fix I'll be sending a patch marking them BROKEN in the Kconfig file. If
these systems are still BROKEN after 2.6.15 we will be removing them.
- kumar
_______________________________________________
Linuxppc-dev mailing list
Lin...@oz...
https://ozlabs.org/mailman/listinfo/linuxppc-dev
|
|
From: Roman Z. <zi...@li...> - 2004-10-10 11:41:57
|
Hi,
Geert Uytterhoeven wrote:
> When looking at arch/m68k/amiga/chipram.c:amiga_chip_init(), there seem to be
> at least 2 problems:
>
> | void __init amiga_chip_init(void)
> | {
> | if (!AMIGAHW_PRESENT(CHIP_RAM))
> | return;
> |
> | #ifndef CONFIG_APUS_FAST_EXCEPT
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> Woops, this is done on m68k as well! Is this condition correct?
> Either we should at a test for PPC, or perhaps this was a typo and it should it
> be `#ifdef' instead of `#ifndef'?
This can actually be removed, CONFIG_APUS_FAST_EXCEPT is always defined
now for APUS.
> | /*
> | * Remove the first 4 pages where PPC exception handlers will be located
> ^^^^^^^^^^^^^^^^^
> | */
> | amiga_chip_size -= 0x4000;
>
> Shouldn't this be
>
> chipram_res.start += 0x4000;
>
> ?
The chipram start was modified in asm-ppc/amigahw.h.
bye, Roman
|
|
From: Geert U. <ge...@li...> - 2004-10-10 09:49:34
|
When looking at arch/m68k/amiga/chipram.c:amiga_chip_init(), there seem to be
at least 2 problems:
| void __init amiga_chip_init(void)
| {
| if (!AMIGAHW_PRESENT(CHIP_RAM))
| return;
|
| #ifndef CONFIG_APUS_FAST_EXCEPT
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Woops, this is done on m68k as well! Is this condition correct?
Either we should at a test for PPC, or perhaps this was a typo and it should it
be `#ifdef' instead of `#ifndef'?
| /*
| * Remove the first 4 pages where PPC exception handlers will be located
^^^^^^^^^^^^^^^^^
| */
| amiga_chip_size -= 0x4000;
Shouldn't this be
chipram_res.start += 0x4000;
?
| #endif
| chipram_res.end = amiga_chip_size-1;
| request_resource(&iomem_resource, &chipram_res);
|
| chipavail = amiga_chip_size;
| }
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
|
|
From: GOTO M. <go...@de...> - 2004-10-02 01:21:30
|
At Fri, 1 Oct 2004 14:10:09 -0700, Tom Rini wrote: > On Sun, Sep 26, 2004 at 02:02:59PM -0700, Tom Rini wrote: > > > Hmmm.. How many of these <asm-ppc/foo.h> #includes <asm-m68k/foo.h> (or > > #else's them in) does glibc (or really, any non-kernel user) need? > > Would someone have the time to try casing all of these inside of #ifdef > > __KERNEL__ ? I've finished doing similar for SH recently (asm/cpu/ and > > asm/mach/ symlinks in this case) and found none of it was really needed. > > How old were the kernel headers in question here? In 2.6 and 2.4 > current, <asm-ppc/setup.h> is already protected with a __KERNEL__ test. We were discussing about 2.6.0-test7. Thanks for your checking - even if that version is not enclosed __KERNEL__, we've just known it'll be fixed in the next linux-kernel-headers update. Regards, -- gotom |
|
From: Tom R. <tr...@ke...> - 2004-10-01 21:11:19
|
On Sun, Sep 26, 2004 at 02:02:59PM -0700, Tom Rini wrote: > Hmmm.. How many of these <asm-ppc/foo.h> #includes <asm-m68k/foo.h> (or > #else's them in) does glibc (or really, any non-kernel user) need? > Would someone have the time to try casing all of these inside of #ifdef > __KERNEL__ ? I've finished doing similar for SH recently (asm/cpu/ and > asm/mach/ symlinks in this case) and found none of it was really needed. How old were the kernel headers in question here? In 2.6 and 2.4 current, <asm-ppc/setup.h> is already protected with a __KERNEL__ test. -- Tom Rini http://gate.crashing.org/~trini/ |
|
From: GOTO M. <go...@de...> - 2004-09-26 23:50:59
|
At Sun, 26 Sep 2004 14:02:59 -0700, Tom Rini wrote: > On Sun, Sep 26, 2004 at 08:42:38PM +0200, Geert Uytterhoeven wrote: > > On Sat, 25 Sep 2004, GOTO Masanori wrote: > > > At Sat, 25 Sep 2004 11:58:56 +1000, > > > Benjamin Herrenschmidt wrote: > > > > On Sat, 2004-09-25 at 11:44, GOTO Masanori wrote: > > > > > At Wed, 15 Sep 2004 14:51:00 -0500, > > > > > Stephen R. Marenka <sma...@de...> wrote: > > > > > > asm/setup.h contains #include <asm-m68k/setup.h>, > > > > > > which is non-existent on ppc. > > > > > > > > > > Then what's the problem? I guess you didn't get any problems; if so I > > > > > close this bug. > > > > > > > > > > BTW, PPC guys, is it intentional to include asm-m68k/setup.h in > > > > > /usr/include/asm-ppc/setup.h ? At a glance, we have no need to > > > > > include this header in setup.h. > > > > > > > > This is historically used by the APUS platform, which I think is an m68k > > > > amiga with a ppc CPU stucked in it, but then, ask Geert, he'll know > > > > better. > > > > > > Thanks for your reply. Geert, is it APUS still alive? If so, I guess > > > asm-m68k/setup.h is necessary for asm-ppc/setup.h. > > > > Yes, AFAIK APUS is still alive. Cool, thanks Geert. > Hmmm.. How many of these <asm-ppc/foo.h> #includes <asm-m68k/foo.h> (or > #else's them in) does glibc (or really, any non-kernel user) need? > Would someone have the time to try casing all of these inside of #ifdef > __KERNEL__ ? I've finished doing similar for SH recently (asm/cpu/ and > asm/mach/ symlinks in this case) and found none of it was really needed. Exactly, AFAIK, there are no headers to include them. Regards, -- gotom |
107 messages has been excluded from this view by a project administrator.
